Commit 3a9d8046 authored by Christian Kuhn's avatar Christian Kuhn
Browse files

Merge branch 'release/3.0.3'

parents a9e612a8 6bd601bd
NAME_BASEIMAGE = typo3gmbh/baseimage
MAJOR_BASEIMAGE=3
MINOR_BASEIMAGE=0
PATCHLEVEL_BASEIMAGE=4
PATCHLEVEL_BASEIMAGE=5
FULLVERSION_BASEIMAGE=$(MAJOR_BASEIMAGE).$(MINOR_BASEIMAGE).$(PATCHLEVEL_BASEIMAGE)
SHORTVERSION_BASEIMAGE=$(MAJOR_BASEIMAGE).$(MINOR_BASEIMAGE)
......@@ -9,56 +9,56 @@ SHORTVERSION_BASEIMAGE=$(MAJOR_BASEIMAGE).$(MINOR_BASEIMAGE)
NAME_PHP53 = typo3gmbh/php53
MAJOR_PHP53=3
MINOR_PHP53=0
PATCHLEVEL_PHP53=4
PATCHLEVEL_PHP53=5
FULLVERSION_PHP53=$(MAJOR_PHP53).$(MINOR_PHP53).$(PATCHLEVEL_PHP53)
SHORTVERSION_PHP53=$(MAJOR_PHP53).$(MINOR_PHP53)
NAME_PHP54 = typo3gmbh/php54
MAJOR_PHP54=3
MINOR_PHP54=0
PATCHLEVEL_PHP54=4
PATCHLEVEL_PHP54=5
FULLVERSION_PHP54=$(MAJOR_PHP54).$(MINOR_PHP54).$(PATCHLEVEL_PHP54)
SHORTVERSION_PHP54=$(MAJOR_PHP54).$(MINOR_PHP54)
NAME_PHP55 = typo3gmbh/php55
MAJOR_PHP55=3
MINOR_PHP55=0
PATCHLEVEL_PHP55=4
PATCHLEVEL_PHP55=5
FULLVERSION_PHP55=$(MAJOR_PHP55).$(MINOR_PHP55).$(PATCHLEVEL_PHP55)
SHORTVERSION_PHP55=$(MAJOR_PHP55).$(MINOR_PHP55)
NAME_PHP56 = typo3gmbh/php56
MAJOR_PHP56=3
MINOR_PHP56=0
PATCHLEVEL_PHP56=4
PATCHLEVEL_PHP56=5
FULLVERSION_PHP56=$(MAJOR_PHP56).$(MINOR_PHP56).$(PATCHLEVEL_PHP56)
SHORTVERSION_PHP56=$(MAJOR_PHP56).$(MINOR_PHP56)
NAME_PHP70 = typo3gmbh/php70
MAJOR_PHP70=3
MINOR_PHP70=0
PATCHLEVEL_PHP70=5
PATCHLEVEL_PHP70=6
FULLVERSION_PHP70=$(MAJOR_PHP70).$(MINOR_PHP70).$(PATCHLEVEL_PHP70)
SHORTVERSION_PHP70=$(MAJOR_PHP70).$(MINOR_PHP70)
NAME_PHP71 = typo3gmbh/php71
MAJOR_PHP71=3
MINOR_PHP71=0
PATCHLEVEL_PHP71=5
PATCHLEVEL_PHP71=6
FULLVERSION_PHP71=$(MAJOR_PHP71).$(MINOR_PHP71).$(PATCHLEVEL_PHP71)
SHORTVERSION_PHP71=$(MAJOR_PHP71).$(MINOR_PHP71)
NAME_PHP72 = typo3gmbh/php72
MAJOR_PHP72=3
MINOR_PHP72=0
PATCHLEVEL_PHP72=5
PATCHLEVEL_PHP72=6
FULLVERSION_PHP72=$(MAJOR_PHP72).$(MINOR_PHP72).$(PATCHLEVEL_PHP72)
SHORTVERSION_PHP72=$(MAJOR_PHP72).$(MINOR_PHP72)
NAME_PHP73 = typo3gmbh/php73
MAJOR_PHP73=3
MINOR_PHP73=0
PATCHLEVEL_PHP73=0
PATCHLEVEL_PHP73=1
FULLVERSION_PHP73=$(MAJOR_PHP73).$(MINOR_PHP73).$(PATCHLEVEL_PHP73)
SHORTVERSION_PHP73=$(MAJOR_PHP73).$(MINOR_PHP73)
......@@ -66,7 +66,7 @@ SHORTVERSION_PHP73=$(MAJOR_PHP73).$(MINOR_PHP73)
NAME_BAMBOO = typo3gmbh/bamboo-remote-agent
MAJOR_BAMBOO=1
MINOR_BAMBOO=0
PATCHLEVEL_BAMBOO=5
PATCHLEVEL_BAMBOO=6
FULLVERSION_BAMBOO=$(MAJOR_BAMBOO).$(MINOR_BAMBOO).$(PATCHLEVEL_BAMBOO)
SHORTVERSION_BAMBOO=$(MAJOR_BAMBOO).$(MINOR_BAMBOO)
......
......@@ -118,6 +118,9 @@ minimal_apt_get_install \
g++ \
#
# make sure npm is kept ... this will probably remove phpX.Y-dev and others, though.
# https://bugs.launchpad.net/ubuntu/+source/nodejs/+bug/1794589
minimal_apt_get_install npm nodejs make g++
apt-get clean
apt-get -y autoremove
......
......@@ -118,6 +118,9 @@ minimal_apt_get_install \
g++ \
#
# make sure npm is kept ... this will probably remove phpX.Y-dev and others, though.
# https://bugs.launchpad.net/ubuntu/+source/nodejs/+bug/1794589
minimal_apt_get_install npm nodejs make g++
apt-get clean
apt-get -y autoremove
......
......@@ -119,6 +119,10 @@ minimal_apt_get_install \
g++ \
#
# make sure npm is kept ... this will probably remove phpX.Y-dev and others, though.
# https://bugs.launchpad.net/ubuntu/+source/nodejs/+bug/1794589
minimal_apt_get_install npm nodejs make g++
apt-get clean
apt-get -y autoremove
rm -rf \
......
......@@ -3,6 +3,10 @@ set -e
source /pd_build/buildconfig
set -x
# make sure npm is kept ... this will probably remove phpX.Y-dev and others, though.
# https://bugs.launchpad.net/ubuntu/+source/nodejs/+bug/1794589
minimal_apt_get_install npm nodejs make g++
apt-get clean
apt-get -y autoremove
rm -rf \
......
......@@ -28,6 +28,10 @@ minimal_apt_get_install \
g++ \
#
# make sure npm is kept ... this will probably remove phpX.Y-dev and others, though.
# https://bugs.launchpad.net/ubuntu/+source/nodejs/+bug/1794589
minimal_apt_get_install npm nodejs make g++
apt-get clean
apt-get -y autoremove
rm -rf \
......
......@@ -26,6 +26,10 @@ minimal_apt_get_install \
g++ \
#
# make sure npm is kept ... this will probably remove phpX.Y-dev and others, though.
# https://bugs.launchpad.net/ubuntu/+source/nodejs/+bug/1794589
minimal_apt_get_install npm nodejs make g++
apt-get clean
apt-get -y autoremove
......
......@@ -3,6 +3,10 @@ set -e
source /pd_build/buildconfig
set -x
# make sure npm is kept ... this will probably remove phpX.Y-dev and others, though.
# https://bugs.launchpad.net/ubuntu/+source/nodejs/+bug/1794589
minimal_apt_get_install npm nodejs make g++
apt-get clean
apt-get -y autoremove
rm -rf \
......
......@@ -3,6 +3,10 @@ set -e
source /pd_build/buildconfig
set -x
# make sure npm is kept ... this will probably remove phpX.Y-dev and others, though.
# https://bugs.launchpad.net/ubuntu/+source/nodejs/+bug/1794589
minimal_apt_get_install npm nodejs make g++
apt-get clean
apt-get -y autoremove
rm -rf \
......
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