Commit 1837976d authored by Christian Kuhn's avatar Christian Kuhn
Browse files

Merge branch 'release/2.0.2'

parents a49ab5ca 98914bec
NAME_BASEIMAGE = typo3gmbh/baseimage
MAJOR_BASEIMAGE=2
MINOR_BASEIMAGE=0
PATCHLEVEL_BASEIMAGE=3
PATCHLEVEL_BASEIMAGE=4
FULLVERSION_BASEIMAGE=$(MAJOR_BASEIMAGE).$(MINOR_BASEIMAGE).$(PATCHLEVEL_BASEIMAGE)
SHORTVERSION_BASEIMAGE=$(MAJOR_BASEIMAGE).$(MINOR_BASEIMAGE)
......@@ -9,49 +9,49 @@ SHORTVERSION_BASEIMAGE=$(MAJOR_BASEIMAGE).$(MINOR_BASEIMAGE)
NAME_PHP53 = typo3gmbh/php53
MAJOR_PHP53=2
MINOR_PHP53=0
PATCHLEVEL_PHP53=3
PATCHLEVEL_PHP53=4
FULLVERSION_PHP53=$(MAJOR_PHP53).$(MINOR_PHP53).$(PATCHLEVEL_PHP53)
SHORTVERSION_PHP53=$(MAJOR_PHP53).$(MINOR_PHP53)
NAME_PHP54 = typo3gmbh/php54
MAJOR_PHP54=2
MINOR_PHP54=0
PATCHLEVEL_PHP54=3
PATCHLEVEL_PHP54=4
FULLVERSION_PHP54=$(MAJOR_PHP54).$(MINOR_PHP54).$(PATCHLEVEL_PHP54)
SHORTVERSION_PHP54=$(MAJOR_PHP54).$(MINOR_PHP54)
NAME_PHP55 = typo3gmbh/php55
MAJOR_PHP55=2
MINOR_PHP55=0
PATCHLEVEL_PHP55=3
PATCHLEVEL_PHP55=4
FULLVERSION_PHP55=$(MAJOR_PHP55).$(MINOR_PHP55).$(PATCHLEVEL_PHP55)
SHORTVERSION_PHP55=$(MAJOR_PHP55).$(MINOR_PHP55)
NAME_PHP56 = typo3gmbh/php56
MAJOR_PHP56=2
MINOR_PHP56=0
PATCHLEVEL_PHP56=3
PATCHLEVEL_PHP56=4
FULLVERSION_PHP56=$(MAJOR_PHP56).$(MINOR_PHP56).$(PATCHLEVEL_PHP56)
SHORTVERSION_PHP56=$(MAJOR_PHP56).$(MINOR_PHP56)
NAME_PHP70 = typo3gmbh/php70
MAJOR_PHP70=2
MINOR_PHP70=0
PATCHLEVEL_PHP70=3
PATCHLEVEL_PHP70=4
FULLVERSION_PHP70=$(MAJOR_PHP70).$(MINOR_PHP70).$(PATCHLEVEL_PHP70)
SHORTVERSION_PHP70=$(MAJOR_PHP70).$(MINOR_PHP70)
NAME_PHP71 = typo3gmbh/php71
MAJOR_PHP71=2
MINOR_PHP71=0
PATCHLEVEL_PHP71=3
PATCHLEVEL_PHP71=4
FULLVERSION_PHP71=$(MAJOR_PHP71).$(MINOR_PHP71).$(PATCHLEVEL_PHP71)
SHORTVERSION_PHP71=$(MAJOR_PHP71).$(MINOR_PHP71)
NAME_PHP72 = typo3gmbh/php72
MAJOR_PHP72=2
MINOR_PHP72=0
PATCHLEVEL_PHP72=3
PATCHLEVEL_PHP72=4
FULLVERSION_PHP72=$(MAJOR_PHP72).$(MINOR_PHP72).$(PATCHLEVEL_PHP72)
SHORTVERSION_PHP72=$(MAJOR_PHP72).$(MINOR_PHP72)
......@@ -59,49 +59,49 @@ SHORTVERSION_PHP72=$(MAJOR_PHP72).$(MINOR_PHP72)
NAME_BAMBOO_PHP53 = typo3gmbh/bamboo-remote-agent-php53
MAJOR_BAMBOO_PHP53=2
MINOR_BAMBOO_PHP53=0
PATCHLEVEL_BAMBOO_PHP53=3
PATCHLEVEL_BAMBOO_PHP53=4
FULLVERSION_BAMBOO_PHP53=$(MAJOR_BAMBOO_PHP53).$(MINOR_BAMBOO_PHP53).$(PATCHLEVEL_BAMBOO_PHP53)
SHORTVERSION_BAMBOO_PHP53=$(MAJOR_BAMBOO_PHP53).$(MINOR_BAMBOO_PHP53)
NAME_BAMBOO_PHP54 = typo3gmbh/bamboo-remote-agent-php54
MAJOR_BAMBOO_PHP54=2
MINOR_BAMBOO_PHP54=0
PATCHLEVEL_BAMBOO_PHP54=3
PATCHLEVEL_BAMBOO_PHP54=4
FULLVERSION_BAMBOO_PHP54=$(MAJOR_BAMBOO_PHP54).$(MINOR_BAMBOO_PHP54).$(PATCHLEVEL_BAMBOO_PHP54)
SHORTVERSION_BAMBOO_PHP54=$(MAJOR_BAMBOO_PHP54).$(MINOR_BAMBOO_PHP54)
NAME_BAMBOO_PHP55 = typo3gmbh/bamboo-remote-agent-php55
MAJOR_BAMBOO_PHP55=2
MINOR_BAMBOO_PHP55=0
PATCHLEVEL_BAMBOO_PHP55=3
PATCHLEVEL_BAMBOO_PHP55=4
FULLVERSION_BAMBOO_PHP55=$(MAJOR_BAMBOO_PHP55).$(MINOR_BAMBOO_PHP55).$(PATCHLEVEL_BAMBOO_PHP55)
SHORTVERSION_BAMBOO_PHP55=$(MAJOR_BAMBOO_PHP55).$(MINOR_BAMBOO_PHP55)
NAME_BAMBOO_PHP56 = typo3gmbh/bamboo-remote-agent-php56
MAJOR_BAMBOO_PHP56=2
MINOR_BAMBOO_PHP56=0
PATCHLEVEL_BAMBOO_PHP56=3
PATCHLEVEL_BAMBOO_PHP56=4
FULLVERSION_BAMBOO_PHP56=$(MAJOR_BAMBOO_PHP56).$(MINOR_BAMBOO_PHP56).$(PATCHLEVEL_BAMBOO_PHP56)
SHORTVERSION_BAMBOO_PHP56=$(MAJOR_BAMBOO_PHP56).$(MINOR_BAMBOO_PHP56)
NAME_BAMBOO_PHP70 = typo3gmbh/bamboo-remote-agent-php70
MAJOR_BAMBOO_PHP70=2
MINOR_BAMBOO_PHP70=0
PATCHLEVEL_BAMBOO_PHP70=3
PATCHLEVEL_BAMBOO_PHP70=4
FULLVERSION_BAMBOO_PHP70=$(MAJOR_BAMBOO_PHP70).$(MINOR_BAMBOO_PHP70).$(PATCHLEVEL_BAMBOO_PHP70)
SHORTVERSION_BAMBOO_PHP70=$(MAJOR_BAMBOO_PHP70).$(MINOR_BAMBOO_PHP70)
NAME_BAMBOO_PHP71 = typo3gmbh/bamboo-remote-agent-php71
MAJOR_BAMBOO_PHP71=2
MINOR_BAMBOO_PHP71=0
PATCHLEVEL_BAMBOO_PHP71=3
PATCHLEVEL_BAMBOO_PHP71=4
FULLVERSION_BAMBOO_PHP71=$(MAJOR_BAMBOO_PHP71).$(MINOR_BAMBOO_PHP71).$(PATCHLEVEL_BAMBOO_PHP71)
SHORTVERSION_BAMBOO_PHP71=$(MAJOR_BAMBOO_PHP71).$(MINOR_BAMBOO_PHP71)
NAME_BAMBOO_PHP72 = typo3gmbh/bamboo-remote-agent-php72
MAJOR_BAMBOO_PHP72=2
MINOR_BAMBOO_PHP72=0
PATCHLEVEL_BAMBOO_PHP72=3
PATCHLEVEL_BAMBOO_PHP72=4
FULLVERSION_BAMBOO_PHP72=$(MAJOR_BAMBOO_PHP72).$(MINOR_BAMBOO_PHP72).$(PATCHLEVEL_BAMBOO_PHP72)
SHORTVERSION_BAMBOO_PHP72=$(MAJOR_BAMBOO_PHP72).$(MINOR_BAMBOO_PHP72)
......
......@@ -57,6 +57,17 @@ echo "apc.slam_defense=0" >> /etc/php/7.0/mods-available/apcu.ini
# echo extension=sqlsrv.so >> /etc/php/7.0/mods-available/sqlsrv.ini
# phpenmod sqlsrv
# Prepare an additional php.ini file that does *NOT* include xdebug
# can be used with: php -n -c /etc/php/cli-no-xdebug/php.ini
mkdir /etc/php/cli-no-xdebug/
php -i | \
grep "\.ini" | \
grep -o -e '\(/[A-Za-z0-9._-]\+\)\+\.ini' | \
grep -v xdebug | \
xargs awk 'FNR==1{print ""}1' | \
grep -v '^;' | \
grep -v '^$' > /etc/php/cli-no-xdebug/php.ini
# Install common tools
minimal_apt_get_install \
graphicsmagick \
......
......@@ -64,6 +64,17 @@ echo "xdebug.max_nesting_level = 400" >> /etc/php/7.1/mods-available/xdebug.ini
# echo extension=sqlsrv.so >> /etc/php/7.1/mods-available/sqlsrv.ini
# phpenmod sqlsrv
# Prepare an additional php.ini file that does *NOT* include xdebug
# can be used with: php -n -c /etc/php/cli-no-xdebug/php.ini
mkdir /etc/php/cli-no-xdebug/
php -i | \
grep "\.ini" | \
grep -o -e '\(/[A-Za-z0-9._-]\+\)\+\.ini' | \
grep -v xdebug | \
xargs awk 'FNR==1{print ""}1' | \
grep -v '^;' | \
grep -v '^$' > /etc/php/cli-no-xdebug/php.ini
# Install common tools
minimal_apt_get_install \
graphicsmagick \
......
......@@ -5,14 +5,22 @@ set -x
apt-get update
# ondrej with a php 7.2 that is some patch levels younger than ubuntu native 18.04
echo deb http://ppa.launchpad.net/ondrej/php/ubuntu bionic main > /etc/apt/sources.list.d/php.list
# postgres with 9.5 next to 10
echo deb http://apt.postgresql.org/pub/repos/apt/ bionic-pgdg main > /etc/apt/sources.list.d/postgres.list
minimal_apt_get_install \
dirmngr \
gpg-agent \
dirmngr \
gpg-agent \
#
# The recv-keys part takes a bit of time, so it's faster to receive multiple keys at once.
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys \
E5267A6C \
#
curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
# mssql and tools
......
......@@ -39,10 +39,6 @@ minimal_apt_get_install \
#
# Enable apc on cli for unit tests
echo "apc.enable_cli=1" >> /etc/php/7.2/mods-available/apcu.ini
echo "apc.slam_defense=0" >> /etc/php/7.2/mods-available/apcu.ini
# Disable opcache on php 7.2 since that triggers segfaults 'zend_mm_heap corrupted' with vfsStream 1.6.4 (currently)
# Note: Still true?
echo "opcache.enable_cli=0" >> /etc/php/7.2/cli/conf.d/10-opcache.ini
......@@ -62,6 +58,17 @@ echo "xdebug.max_nesting_level = 400" >> /etc/php/7.2/mods-available/xdebug.ini
#echo extension=sqlsrv.so >> /etc/php/7.2/mods-available/sqlsrv.ini
#phpenmod sqlsrv
# Prepare an additional php.ini file that does *NOT* include xdebug
# can be used with: php -n -c /etc/php/cli-no-xdebug/php.ini
mkdir /etc/php/cli-no-xdebug/
php -i | \
grep "\.ini" | \
grep -o -e '\(/[A-Za-z0-9._-]\+\)\+\.ini' | \
grep -v xdebug | \
xargs awk 'FNR==1{print ""}1' | \
grep -v '^;' | \
grep -v '^$' > /etc/php/cli-no-xdebug/php.ini
# Install common tools
minimal_apt_get_install \
graphicsmagick \
......
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