Commit 9ee14bbb authored by Christian Kuhn's avatar Christian Kuhn
Browse files

Merge branch 'release/1.0.7'

parents f4b51585 0b6d78b3
......@@ -37,7 +37,7 @@ SHORTVERSION_PHP56=$(MAJOR_PHP56).$(MINOR_PHP56)
NAME_PHP70 = typo3gmbh/php70
MAJOR_PHP70=1
MINOR_PHP70=0
PATCHLEVEL_PHP70=2
PATCHLEVEL_PHP70=3
FULLVERSION_PHP70=$(MAJOR_PHP70).$(MINOR_PHP70).$(PATCHLEVEL_PHP70)
SHORTVERSION_PHP70=$(MAJOR_PHP70).$(MINOR_PHP70)
......@@ -80,7 +80,7 @@ SHORTVERSION_BAMBOO_PHP56=$(MAJOR_BAMBOO_PHP56).$(MINOR_BAMBOO_PHP56)
NAME_BAMBOO_PHP70 = typo3gmbh/bamboo-remote-agent-php70
MAJOR_BAMBOO_PHP70=1
MINOR_BAMBOO_PHP70=0
PATCHLEVEL_BAMBOO_PHP70=17
PATCHLEVEL_BAMBOO_PHP70=18
FULLVERSION_BAMBOO_PHP70=$(MAJOR_BAMBOO_PHP70).$(MINOR_BAMBOO_PHP70).$(PATCHLEVEL_BAMBOO_PHP70)
SHORTVERSION_BAMBOO_PHP70=$(MAJOR_BAMBOO_PHP70).$(MINOR_BAMBOO_PHP70)
......
......@@ -3,5 +3,10 @@ set -e
source /pd_build/buildconfig
set -x
# mssql and tools
curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add -
curl https://packages.microsoft.com/config/ubuntu/16.04/mssql-server.list | tee /etc/apt/sources.list.d/mssql-server.list
curl https://packages.microsoft.com/config/ubuntu/16.04/prod.list | tee /etc/apt/sources.list.d/msprod.list
## NodeSource's Node.js repository
curl --fail -sL https://deb.nodesource.com/setup_4.x | bash -
......@@ -9,8 +9,10 @@ apt-get remove -y --purge \
automake \
autotools-dev \
binutils \
build-essential \
cpp \
cpp-5 \
dpkg-dev \
file \
gcc \
gcc-5 \
......
......@@ -7,6 +7,7 @@ set -x
/pd_build/prepare.sh
/pd_build/mysql.sh
/pd_build/postgres.sh
/pd_build/mssql.sh
/pd_build/redis-server.sh
/pd_build/memcached.sh
/pd_build/nodejs.sh
......
#!/bin/bash
set -e
source /pd_build/buildconfig
set -x
ACCEPT_EULA=Y minimal_apt_get_install \
mssql-server \
sudo \
mssql-tools \
unixodbc-dev \
#
SA_PASSWORD='Test1234!' /opt/mssql/lib/mssql-conf/mssql-conf.py setup accept-eula || true
## Enable mysql
cp -a /pd_build/runit/mssql /etc/service/mssql
\ No newline at end of file
......@@ -4,12 +4,14 @@ source /pd_build/buildconfig
set -x
minimal_apt_get_install \
build-essential \
php7.0 \
php7.0-bcmath \
php7.0-bz2 \
php7.0-cli \
php7.0-common \
php7.0-curl \
php7.0-dev \
php7.0-gd \
php7.0-gmp \
php7.0-imap \
......@@ -31,6 +33,7 @@ minimal_apt_get_install \
php-redis \
php-memcached \
php-xdebug \
php-pear \
#
## Enable phar writing
......@@ -38,4 +41,9 @@ sed -i s/';phar.readonly = On'/'phar.readonly = Off'/ /etc/php/7.0/cli/php.ini
/pd_build/php-apcu.sh
# mssql driver
pecl install sqlsrv
echo extension=sqlsrv.so >> /etc/php/7.0/mods-available/sqlsrv.ini
phpenmod sqlsrv
/pd_build/php-finalize.sh
#!/bin/sh
mkdir -p /var/log/mssql
exec svlogd -tt /var/log/mssql
#!/bin/sh
exec 2>&1
exec chpst -u mssql /opt/mssql/bin/sqlservr
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment