Commit d94ae800 authored by Christian Kuhn's avatar Christian Kuhn
Browse files

Merge branch 'release/1.0.15'

parents 5536b0e4 b586145a
NAME_BASEIMAGE = typo3gmbh/baseimage
MAJOR_BASEIMAGE=1
MINOR_BASEIMAGE=0
PATCHLEVEL_BASEIMAGE=6
PATCHLEVEL_BASEIMAGE=7
FULLVERSION_BASEIMAGE=$(MAJOR_BASEIMAGE).$(MINOR_BASEIMAGE).$(PATCHLEVEL_BASEIMAGE)
SHORTVERSION_BASEIMAGE=$(MAJOR_BASEIMAGE).$(MINOR_BASEIMAGE)
......@@ -9,42 +9,42 @@ SHORTVERSION_BASEIMAGE=$(MAJOR_BASEIMAGE).$(MINOR_BASEIMAGE)
NAME_PHP53 = typo3gmbh/php53
MAJOR_PHP53=1
MINOR_PHP53=0
PATCHLEVEL_PHP53=5
PATCHLEVEL_PHP53=6
FULLVERSION_PHP53=$(MAJOR_PHP53).$(MINOR_PHP53).$(PATCHLEVEL_PHP53)
SHORTVERSION_PHP53=$(MAJOR_PHP53).$(MINOR_PHP53)
NAME_PHP54 = typo3gmbh/php54
MAJOR_PHP54=1
MINOR_PHP54=0
PATCHLEVEL_PHP54=5
PATCHLEVEL_PHP54=6
FULLVERSION_PHP54=$(MAJOR_PHP54).$(MINOR_PHP54).$(PATCHLEVEL_PHP54)
SHORTVERSION_PHP54=$(MAJOR_PHP54).$(MINOR_PHP54)
NAME_PHP55 = typo3gmbh/php55
MAJOR_PHP55=1
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=1
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=1
MINOR_PHP70=0
PATCHLEVEL_PHP70=8
PATCHLEVEL_PHP70=9
FULLVERSION_PHP70=$(MAJOR_PHP70).$(MINOR_PHP70).$(PATCHLEVEL_PHP70)
SHORTVERSION_PHP70=$(MAJOR_PHP70).$(MINOR_PHP70)
NAME_PHP71 = typo3gmbh/php71
MAJOR_PHP71=1
MINOR_PHP71=0
PATCHLEVEL_PHP71=7
PATCHLEVEL_PHP71=8
FULLVERSION_PHP71=$(MAJOR_PHP71).$(MINOR_PHP71).$(PATCHLEVEL_PHP71)
SHORTVERSION_PHP71=$(MAJOR_PHP71).$(MINOR_PHP71)
......@@ -52,42 +52,42 @@ SHORTVERSION_PHP71=$(MAJOR_PHP71).$(MINOR_PHP71)
NAME_BAMBOO_PHP53 = typo3gmbh/bamboo-remote-agent-php53
MAJOR_BAMBOO_PHP53=1
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=1
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=1
MINOR_BAMBOO_PHP55=0
PATCHLEVEL_BAMBOO_PHP55=6
PATCHLEVEL_BAMBOO_PHP55=7
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=1
MINOR_BAMBOO_PHP56=0
PATCHLEVEL_BAMBOO_PHP56=6
PATCHLEVEL_BAMBOO_PHP56=7
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=1
MINOR_BAMBOO_PHP70=0
PATCHLEVEL_BAMBOO_PHP70=23
PATCHLEVEL_BAMBOO_PHP70=24
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=1
MINOR_BAMBOO_PHP71=0
PATCHLEVEL_BAMBOO_PHP71=14
PATCHLEVEL_BAMBOO_PHP71=15
FULLVERSION_BAMBOO_PHP71=$(MAJOR_BAMBOO_PHP71).$(MINOR_BAMBOO_PHP71).$(PATCHLEVEL_BAMBOO_PHP71)
SHORTVERSION_BAMBOO_PHP71=$(MAJOR_BAMBOO_PHP71).$(MINOR_BAMBOO_PHP71)
......
......@@ -9,7 +9,7 @@ chmod 0775 /srv/bamboo-agent-home
chown bamboo:bamboo /srv/bamboo-agent-home
# Install bamboo remote agent
curl -SL --progress-bar https://bamboo.typo3.com/agentServer/agentInstaller/atlassian-bamboo-agent-installer-5.14.1.jar -o /tmp/bamboo-installer.jar
curl -SL --progress-bar https://bamboo.typo3.com/agentServer/agentInstaller/ -o /tmp/bamboo-installer.jar
/usr/bin/java -Dbamboo.home=/srv/bamboo-agent-home -jar /tmp/bamboo-installer.jar https://bamboo.typo3.com/agentServer install
chown -R bamboo:bamboo /srv/bamboo-agent-home
rm -f /tmp/bamboo-installer.jar
......
......@@ -9,7 +9,7 @@ chmod 0775 /srv/bamboo-agent-home
chown bamboo:bamboo /srv/bamboo-agent-home
# Install bamboo remote agent
curl -SL --progress-bar https://bamboo.typo3.com/agentServer/agentInstaller/atlassian-bamboo-agent-installer-5.14.1.jar -o /tmp/bamboo-installer.jar
curl -SL --progress-bar https://bamboo.typo3.com/agentServer/agentInstaller/ -o /tmp/bamboo-installer.jar
/usr/bin/java -Dbamboo.home=/srv/bamboo-agent-home -jar /tmp/bamboo-installer.jar https://bamboo.typo3.com/agentServer install
chown -R bamboo:bamboo /srv/bamboo-agent-home
rm -f /tmp/bamboo-installer.jar
......
......@@ -9,7 +9,7 @@ chmod 0775 /srv/bamboo-agent-home
chown bamboo:bamboo /srv/bamboo-agent-home
# Install bamboo remote agent
curl -SL --progress-bar https://bamboo.typo3.com/agentServer/agentInstaller/atlassian-bamboo-agent-installer-5.14.1.jar -o /tmp/bamboo-installer.jar
curl -SL --progress-bar https://bamboo.typo3.com/agentServer/agentInstaller/ -o /tmp/bamboo-installer.jar
/usr/bin/java -Dbamboo.home=/srv/bamboo-agent-home -jar /tmp/bamboo-installer.jar https://bamboo.typo3.com/agentServer install
chown -R bamboo:bamboo /srv/bamboo-agent-home
rm -f /tmp/bamboo-installer.jar
......
......@@ -9,7 +9,7 @@ chmod 0775 /srv/bamboo-agent-home
chown bamboo:bamboo /srv/bamboo-agent-home
# Install bamboo remote agent
curl -SL --progress-bar https://bamboo.typo3.com/agentServer/agentInstaller/atlassian-bamboo-agent-installer-5.14.1.jar -o /tmp/bamboo-installer.jar
curl -SL --progress-bar https://bamboo.typo3.com/agentServer/agentInstaller/ -o /tmp/bamboo-installer.jar
/usr/bin/java -Dbamboo.home=/srv/bamboo-agent-home -jar /tmp/bamboo-installer.jar https://bamboo.typo3.com/agentServer install
chown -R bamboo:bamboo /srv/bamboo-agent-home
rm -f /tmp/bamboo-installer.jar
......
......@@ -9,7 +9,7 @@ chmod 0775 /srv/bamboo-agent-home
chown bamboo:bamboo /srv/bamboo-agent-home
# Install bamboo remote agent
curl -SL --progress-bar https://bamboo.typo3.com/agentServer/agentInstaller/atlassian-bamboo-agent-installer-5.14.1.jar -o /tmp/bamboo-installer.jar
curl -SL --progress-bar https://bamboo.typo3.com/agentServer/agentInstaller/ -o /tmp/bamboo-installer.jar
/usr/bin/java -Dbamboo.home=/srv/bamboo-agent-home -jar /tmp/bamboo-installer.jar https://bamboo.typo3.com/agentServer install
chown -R bamboo:bamboo /srv/bamboo-agent-home
rm -f /tmp/bamboo-installer.jar
......
......@@ -9,7 +9,7 @@ chmod 0775 /srv/bamboo-agent-home
chown bamboo:bamboo /srv/bamboo-agent-home
# Install bamboo remote agent
curl -SL --progress-bar https://bamboo.typo3.com/agentServer/agentInstaller/atlassian-bamboo-agent-installer-5.14.1.jar -o /tmp/bamboo-installer.jar
curl -SL --progress-bar https://bamboo.typo3.com/agentServer/agentInstaller/ -o /tmp/bamboo-installer.jar
/usr/bin/java -Dbamboo.home=/srv/bamboo-agent-home -jar /tmp/bamboo-installer.jar https://bamboo.typo3.com/agentServer install
chown -R bamboo:bamboo /srv/bamboo-agent-home
rm -f /tmp/bamboo-installer.jar
......
......@@ -4,4 +4,4 @@ source /pd_build/buildconfig
set -x
## NodeSource's Node.js repository
curl --fail -sL https://deb.nodesource.com/setup_4.x | bash -
curl --fail -sL https://deb.nodesource.com/setup_8.x | bash -
......@@ -5,11 +5,9 @@ set -x
apt-get remove -y --purge \
autoconf \
bison \
dpkg-dev \
file \
flex \
gcc \
krb5-multidev \
libapparmor-dev \
libapr1-dev \
......@@ -71,30 +69,17 @@ apt-get remove -y --purge \
libxslt1-dev \
libxt-dev \
libzip-dev \
make \
pkg-config \
re2c \
unixodbc-dev \
uuid-dev \
zlib1g-dev \
autotools-dev \
binutils \
comerr-dev \
cpp \
cpp-5 \
gcc-5 \
icu-devtools \
libasan2 \
libatomic1 \
libbison-dev \
libc-client2007e \
libc-dev-bin \
libc6-dev \
libcc1-0 \
libcilkrts5 \
libdpkg-perl \
libfl-dev \
libgcc-5-dev \
libgmp-dev \
libgmpxx4ldbl \
libgnutls-openssl27 \
......@@ -137,6 +122,10 @@ apt-get remove -y --purge \
xtrans-dev \
#
# but keep make and g++ ... to not confuse with above list, just install again if needed
minimal_apt_get_install \
make \
g++
apt-get clean
......
......@@ -3,8 +3,8 @@ set -e
source /pd_build/buildconfig
set -x
## Install Node.js
minimal_apt_get_install nodejs
# Install Node.js and some packages to successfully compile stuff
minimal_apt_get_install nodejs make g++
## And update nodejs on global level
npm update -g
\ No newline at end of file
# And update npm afterwards
npm install npm -g
......@@ -4,4 +4,4 @@ source /pd_build/buildconfig
set -x
## NodeSource's Node.js repository
curl --fail -sL https://deb.nodesource.com/setup_4.x | bash -
curl --fail -sL https://deb.nodesource.com/setup_8.x | bash -
\ No newline at end of file
......@@ -5,11 +5,9 @@ set -x
apt-get remove -y --purge \
autoconf \
bison \
dpkg-dev \
file \
flex \
gcc \
krb5-multidev \
libapparmor-dev \
libapr1-dev \
......@@ -71,30 +69,17 @@ apt-get remove -y --purge \
libxslt1-dev \
libxt-dev \
libzip-dev \
make \
pkg-config \
re2c \
unixodbc-dev \
uuid-dev \
zlib1g-dev \
autotools-dev \
binutils \
comerr-dev \
cpp \
cpp-5 \
gcc-5 \
icu-devtools \
libasan2 \
libatomic1 \
libbison-dev \
libc-client2007e \
libc-dev-bin \
libc6-dev \
libcc1-0 \
libcilkrts5 \
libdpkg-perl \
libfl-dev \
libgcc-5-dev \
libgmp-dev \
libgmpxx4ldbl \
libgnutls-openssl27 \
......@@ -137,6 +122,10 @@ apt-get remove -y --purge \
xtrans-dev \
#
# but keep make and g++ ... to not confuse with above list, just install again if needed
minimal_apt_get_install \
make \
g++
apt-get clean
......
......@@ -3,8 +3,8 @@ set -e
source /pd_build/buildconfig
set -x
## Install Node.js
minimal_apt_get_install nodejs
# Install Node.js and some packages to successfully compile stuff
minimal_apt_get_install nodejs make g++
## And update nodejs on global level
npm update -g
\ No newline at end of file
# And update npm afterwards
npm install npm -g
......@@ -4,4 +4,4 @@ source /pd_build/buildconfig
set -x
## NodeSource's Node.js repository
curl --fail -sL https://deb.nodesource.com/setup_4.x | bash -
curl --fail -sL https://deb.nodesource.com/setup_8.x | bash -
\ No newline at end of file
......@@ -5,11 +5,9 @@ set -x
apt-get remove -y --purge \
autoconf \
bison \
dpkg-dev \
file \
flex \
gcc \
krb5-multidev \
libapparmor-dev \
libapr1-dev \
......@@ -78,23 +76,11 @@ apt-get remove -y --purge \
uuid-dev \
zlib1g-dev \
autotools-dev \
binutils \
comerr-dev \
cpp \
cpp-5 \
gcc-5 \
icu-devtools \
libasan2 \
libatomic1 \
libbison-dev \
libc-client2007e \
libc-dev-bin \
libc6-dev \
libcc1-0 \
libcilkrts5 \
libdpkg-perl \
libfl-dev \
libgcc-5-dev \
libgmp-dev \
libgmpxx4ldbl \
libgnutls-openssl27 \
......@@ -137,6 +123,12 @@ apt-get remove -y --purge \
xtrans-dev \
#
# but keep make and g++ ... to not confuse with above list, just install again if needed
minimal_apt_get_install \
make \
g++
apt-get clean
rm -rf \
/var/lib/apt/lists/* \
......
......@@ -3,8 +3,8 @@ set -e
source /pd_build/buildconfig
set -x
## Install Node.js
minimal_apt_get_install nodejs
# Install Node.js and some packages to successfully compile stuff
minimal_apt_get_install nodejs make g++
## And update nodejs on global level
npm update -g
\ No newline at end of file
# And update npm afterwards
npm install npm -g
......@@ -12,4 +12,4 @@ apt-key adv --keyserver keyserver.ubuntu.com --recv-keys \
#
## NodeSource's Node.js repository
curl --fail -sL https://deb.nodesource.com/setup_4.x | bash -
curl --fail -sL https://deb.nodesource.com/setup_8.x | bash -
\ No newline at end of file
......@@ -3,8 +3,8 @@ set -e
source /pd_build/buildconfig
set -x
## Install Node.js
minimal_apt_get_install nodejs
# Install Node.js and some packages to successfully compile stuff
minimal_apt_get_install nodejs make g++
## And update nodejs on global level
npm update -g
\ No newline at end of file
# And update npm afterwards
npm install npm -g
......@@ -13,4 +13,4 @@ curl https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -
echo "deb [arch=amd64] https://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google-chrome.list
# NodeSource's Node.js repository
curl --fail -sL https://deb.nodesource.com/setup_4.x | bash -
curl --fail -sL https://deb.nodesource.com/setup_8.x | bash -
\ No newline at end of file
......@@ -8,26 +8,9 @@ apt-get remove -y --purge \
autoconf \
automake \
autotools-dev \
binutils \
build-essential \
cpp \
cpp-5 \
dpkg-dev \
file \
gcc \
gcc-5 \
libasan2 \
libatomic1 \
libc-dev-bin \
libc6-dev \
libcc1-0 \
libcilkrts5 \
libgcc-5-dev \
libisl15 \
libitm1 \
liblsan0 \
libmpc3 \
libmpx0 \
libpcre16-3 \
libpcre3-dev \
libpcre32-3 \
......@@ -39,12 +22,16 @@ apt-get remove -y --purge \
libubsan0 \
linux-libc-dev \
m4 \
make \
php7.0-dev \
shtool \
zlib1g-dev \
#
# but keep make and g++ ... to not confuse with above list, just install again if needed
minimal_apt_get_install \
make \
g++
apt-get clean
rm -rf \
/var/lib/apt/lists/* \
......
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