Commit 53ad9988 authored by Christian Kuhn's avatar Christian Kuhn
Browse files

Merge branch 'release/1.0.2'

parents 0c3bcb4b d9034a50
NAME_BASEIMAGE = typo3gmbh/baseimage
MAJOR_BASEIMAGE=1
MINOR_BASEIMAGE=0
PATCHLEVEL_BASEIMAGE=3
PATCHLEVEL_BASEIMAGE=4
FULLVERSION_BASEIMAGE=$(MAJOR_BASEIMAGE).$(MINOR_BASEIMAGE).$(PATCHLEVEL_BASEIMAGE)
SHORTVERSION_BASEIMAGE=$(MAJOR_BASEIMAGE).$(MINOR_BASEIMAGE)
......@@ -9,20 +9,20 @@ SHORTVERSION_BASEIMAGE=$(MAJOR_BASEIMAGE).$(MINOR_BASEIMAGE)
NAME_PHP53 = typo3gmbh/php53
MAJOR_PHP53=1
MINOR_PHP53=0
PATCHLEVEL_PHP53=1
PATCHLEVEL_PHP53=2
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=1
PATCHLEVEL_PHP54=2
FULLVERSION_PHP54=$(MAJOR_PHP54).$(MINOR_PHP54).$(PATCHLEVEL_PHP54)
SHORTVERSION_PHP54=$(MAJOR_PHP54).$(MINOR_PHP54)
NAME_PHP55 = typo3gmbh/php55
MAJOR_PHP55=1
MINOR_PHP55=0
MINOR_PHP55=1
PATCHLEVEL_PHP55=0
FULLVERSION_PHP55=$(MAJOR_PHP55).$(MINOR_PHP55).$(PATCHLEVEL_PHP55)
SHORTVERSION_PHP55=$(MAJOR_PHP55).$(MINOR_PHP55)
......@@ -30,21 +30,21 @@ SHORTVERSION_PHP55=$(MAJOR_PHP55).$(MINOR_PHP55)
NAME_PHP56 = typo3gmbh/php56
MAJOR_PHP56=1
MINOR_PHP56=0
PATCHLEVEL_PHP56=0
PATCHLEVEL_PHP56=1
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=0
PATCHLEVEL_PHP70=1
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=0
PATCHLEVEL_PHP71=1
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=0
PATCHLEVEL_BAMBOO_PHP53=1
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=0
PATCHLEVEL_BAMBOO_PHP54=1
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=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=1
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=1
MINOR_BAMBOO_PHP70=0
PATCHLEVEL_BAMBOO_PHP70=15
PATCHLEVEL_BAMBOO_PHP70=16
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=7
PATCHLEVEL_BAMBOO_PHP71=8
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.12.2.1.jar -o /tmp/bamboo-installer.jar
curl -SL --progress-bar https://bamboo.typo3.com/agentServer/agentInstaller/atlassian-bamboo-agent-installer-5.14.1.jar -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.12.2.1.jar -o /tmp/bamboo-installer.jar
curl -SL --progress-bar https://bamboo.typo3.com/agentServer/agentInstaller/atlassian-bamboo-agent-installer-5.14.1.jar -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.12.2.1.jar -o /tmp/bamboo-installer.jar
curl -SL --progress-bar https://bamboo.typo3.com/agentServer/agentInstaller/atlassian-bamboo-agent-installer-5.14.1.jar -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.12.2.1.jar -o /tmp/bamboo-installer.jar
curl -SL --progress-bar https://bamboo.typo3.com/agentServer/agentInstaller/atlassian-bamboo-agent-installer-5.14.1.jar -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.12.2.1.jar -o /tmp/bamboo-installer.jar
curl -SL --progress-bar https://bamboo.typo3.com/agentServer/agentInstaller/atlassian-bamboo-agent-installer-5.14.1.jar -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.12.2.1.jar -o /tmp/bamboo-installer.jar
curl -SL --progress-bar https://bamboo.typo3.com/agentServer/agentInstaller/atlassian-bamboo-agent-installer-5.14.1.jar -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
......
......@@ -137,7 +137,7 @@ curl -SL --progress-bar https://www.openssl.org/source/old/0.9.x/openssl-0.9.8v.
tar xvf openssl-0.9.8v.tar.gz
cd openssl-0.9.8v
./config
make
make -j 10
make install_sw
cd ..
......@@ -195,5 +195,5 @@ sed -i s/'memory_limit = 128M'/'memory_limit = 1280M'/ /usr/local/lib/php.ini
sed -i s/';phar.readonly = On'/'phar.readonly = Off'/ /usr/local/lib/php.ini
# Install composer
curl -sSL https://getcomposer.org/download/1.1.2/composer.phar -o /usr/bin/composer
curl -sSL https://getcomposer.org/download/1.3.1/composer.phar -o /usr/bin/composer
chmod +x /usr/bin/composer
......@@ -137,7 +137,7 @@ curl -SL --progress-bar https://www.openssl.org/source/old/0.9.x/openssl-0.9.8v.
tar xvf openssl-0.9.8v.tar.gz
cd openssl-0.9.8v
./config
make
make -j 10
make install_sw
cd ..
......@@ -195,5 +195,5 @@ sed -i s/'memory_limit = 128M'/'memory_limit = 1280M'/ /usr/local/lib/php.ini
sed -i s/';phar.readonly = On'/'phar.readonly = Off'/ /usr/local/lib/php.ini
# Install composer
curl -sSL https://getcomposer.org/download/1.1.2/composer.phar -o /usr/bin/composer
curl -sSL https://getcomposer.org/download/1.3.1/composer.phar -o /usr/bin/composer
chmod +x /usr/bin/composer
......@@ -3,13 +3,5 @@ set -e
source /pd_build/buildconfig
set -x
## ondrej with php 5.5
echo deb http://ppa.launchpad.net/ondrej/php/ubuntu xenial main > /etc/apt/sources.list.d/php.list
# 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 \
#
## NodeSource's Node.js repository
curl --fail -sL https://deb.nodesource.com/setup_4.x | bash -
#!/bin/bash
set -e
source /pd_build/buildconfig
set -x
## This script is to be run after php.sh.
## Install common tools
minimal_apt_get_install \
graphicsmagick \
zip \
unzip \
#
# Install composer
curl -sSL https://getcomposer.org/download/1.1.2/composer.phar -o /usr/bin/composer
chmod +x /usr/bin/composer
......@@ -3,37 +3,196 @@ set -e
source /pd_build/buildconfig
set -x
cd /usr/local/src/
minimal_apt_get_install \
php5.5 \
php5.5-bcmath \
php5.5-bz2 \
php5.5-cli \
php5.5-common \
php5.5-curl \
php5.5-gd \
php5.5-gmp \
php5.5-imap \
php5.5-intl \
php5.5-json \
php5.5-mbstring \
php5.5-mcrypt \
php5.5-mysql \
php5.5-opcache \
php5.5-pgsql \
php5.5-pspell \
php5.5-readline \
php5.5-recode \
php5.5-sqlite3 \
php5.5-xml \
php5.5-xmlrpc \
php5.5-xsl \
php5.5-zip \
php-redis \
php-memcached \
php-xdebug \
graphicsmagick \
zip \
unzip \
make \
gcc \
autoconf \
bison \
re2c \
file \
flex \
mcrypt \
aspell \
bsdmainutils \
libxpm-dev \
libsasl2-dev \
libpspell-dev \
libreadline-dev \
libaspell-dev \
libxml2 \
libxml2-dev \
libbz2-dev \
libzip-dev \
libzip4 \
zlib1g \
zlib1g-dev \
libcurl4-openssl-dev \
libcurl3 \
libcurl3-gnutls \
libc-client-dev \
libfreetype6 \
libfreetype6-dev \
libpng12-0 \
libpng12-dev \
libmcrypt-dev \
libmcrypt4 \
libtidy-dev \
libxslt1-dev \
libgnutls-dev \
krb5-multidev \
libapparmor-dev \
libapr1 \
libapr1-dev \
libaprutil1 \
libaprutil1-dev \
libarchive-zip-perl \
libasprintf0v5 \
libbsd-dev \
libcroco3 \
libct4 \
libdb-dev \
libdb5.3-dev \
libelf1 \
libexpat1-dev \
libfontconfig1-dev \
libgcrypt11-dev \
libgcrypt20-dev \
libgd-dev \
libgd3 \
libglib2.0-bin \
libglib2.0-data \
libglib2.0-dev \
libgmp3-dev \
libgpg-error-dev \
libhunspell-1.3-0 \
libib-util \
libice-dev \
libice6 \
libjbig-dev \
libjbig0 \
libjpeg-dev \
libjpeg-turbo8-dev \
libjpeg8-dev \
libkrb5-dev \
libldap2-dev \
libltdl-dev \
libltdl7 \
liblzma-dev \
libmagic-dev \
libmhash-dev \
libmysqlclient-dev \
libodbc1 \
libonig-dev \
libonig2 \
libpcre16-3 \
libpcre3-dev \
libpcre32-3 \
libpcrecpp0v5 \
libpipeline1 \
libpq-dev \
libpq5 \
libpython-stdlib \
libpython2.7-minimal \
libpython2.7-stdlib \
libqdbm-dev \
libqdbm14 \
librecode-dev \
librecode0 \
libsctp-dev \
libsctp1 \
libsm-dev \
libsm6 \
libsqlite3-dev \
libsybdb5 \
libsystemd-dev \
libtiff5 \
libtiff5-dev \
libtiffxx5 \
libtimedate-perl \
libtool \
libunistring0 \
libvpx-dev \
libvpx3 \
libwebp-dev \
libwebp5 \
libwebpdemux1 \
libwebpmux1 \
libxmlrpc-epi-dev \
libxmlrpc-epi0 \
libxmltok1 \
libxmltok1-dev \
libxt-dev \
libxt6 \
unixodbc \
unixodbc-dev \
uuid-dev \
#
## Enable phar writing
sed -i s/';phar.readonly = On'/'phar.readonly = Off'/ /etc/php/5.5/cli/php.ini
curl -SL --progress-bar https://www.openssl.org/source/old/0.9.x/openssl-0.9.8v.tar.gz -o openssl-0.9.8v.tar.gz
tar xvf openssl-0.9.8v.tar.gz
cd openssl-0.9.8v
./config
make -j 10
make install_sw
cd ..
curl -SL --progress-bar http://in1.php.net/distributions/php-5.5.38.tar.bz2 -o php-5.5.38.tar.bz2
tar -xvf php-5.5.38.tar.bz2
cd php-5.5.38
./configure \
--without-t1lib \
--disable-short-tags \
--enable-pcntl \
--with-tsrm-pthreads \
--with-mysqli=mysqlnd \
--with-mysql=mysqlnd \
--with-pdo-mysql \
--with-zlib \
--enable-sysvmsg \
--enable-sysvsem \
--enable-sysvshm \
--enable-bcmath \
--with-bz2 \
--enable-calendar \
--enable-exif \
--enable-ftp \
--with-gd \
--enable-gd-native-ttf \
--enable-gd-jis-conv \
--with-iconv-dir \
--with-gettext \
--enable-mbstring \
--with-mcrypt \
--with-mhash \
--with-pspell \
--with-readline \
--enable-soap \
--enable-sockets \
--enable-wddx \
--with-xmlrpc \
--with-xsl \
--with-openssl=/usr/local/ssl/ \
--enable-zip \
--with-tidy \
--with-curl \
#
make -j 10
make install
cp /usr/local/src/php-5.5.38/php.ini-development /usr/local/lib/php.ini
# more memory
sed -i s/'memory_limit = 128M'/'memory_limit = 1280M'/ /usr/local/lib/php.ini
sed -i s/';phar.readonly = On'/'phar.readonly = Off'/ /usr/local/lib/php.ini
sed -i s/';date.timezone ='/'date.timezone = UTC'/ /usr/local/lib/php.ini
/pd_build/php-finalize.sh
# Install composer
curl -sSL https://getcomposer.org/download/1.3.1/composer.phar -o /usr/bin/composer
chmod +x /usr/bin/composer
#!/bin/bash
set -e
source /pd_build/buildconfig
set -x
## This script is to be run after php.sh.
## Install common tools
minimal_apt_get_install \
graphicsmagick \
zip \
unzip \
#
# Install composer
curl -sSL https://getcomposer.org/download/1.1.2/composer.phar -o /usr/bin/composer
chmod +x /usr/bin/composer
......@@ -36,4 +36,13 @@ minimal_apt_get_install \
## Enable phar writing
sed -i s/';phar.readonly = On'/'phar.readonly = Off'/ /etc/php/5.6/cli/php.ini
/pd_build/php-finalize.sh
## Install common tools
minimal_apt_get_install \
graphicsmagick \
zip \
unzip \
#
# Install composer
curl -sSL https://getcomposer.org/download/1.3.1/composer.phar -o /usr/bin/composer
chmod +x /usr/bin/composer
......@@ -11,7 +11,7 @@ minimal_apt_get_install \
libgtk2.0-0 \
#
curl -SL --progress-bar https://ftp.mozilla.org/pub/firefox/releases/45.4.0esr/linux-x86_64/en-US/firefox-45.4.0esr.tar.bz2 -o /tmp/firefox.tar.bz2
curl -SL --progress-bar https://ftp.mozilla.org/pub/firefox/releases/45.6.0esr/linux-x86_64/en-US/firefox-45.6.0esr.tar.bz2 -o /tmp/firefox.tar.bz2
tar xv -C /opt/ -f /tmp/firefox.tar.bz2
ln -s /opt/firefox/firefox /usr/bin/firefox
......
......@@ -5,6 +5,7 @@ set -x
minimal_apt_get_install \
make \
re2c \
php7.0-dev \
#
......
......@@ -13,5 +13,5 @@ minimal_apt_get_install \
#
# Install composer
curl -sSL https://getcomposer.org/download/1.1.2/composer.phar -o /usr/bin/composer
curl -sSL https://getcomposer.org/download/1.3.1/composer.phar -o /usr/bin/composer
chmod +x /usr/bin/composer
......@@ -11,7 +11,7 @@ minimal_apt_get_install \
libgtk2.0-0 \
#
curl -SL --progress-bar https://ftp.mozilla.org/pub/firefox/releases/45.4.0esr/linux-x86_64/en-US/firefox-45.4.0esr.tar.bz2 -o /tmp/firefox.tar.bz2
curl -SL --progress-bar https://ftp.mozilla.org/pub/firefox/releases/45.6.0esr/linux-x86_64/en-US/firefox-45.6.0esr.tar.bz2 -o /tmp/firefox.tar.bz2
tar xv -C /opt/ -f /tmp/firefox.tar.bz2
ln -s /opt/firefox/firefox /usr/bin/firefox
......
......@@ -5,6 +5,7 @@ set -x
minimal_apt_get_install \
make \
re2c \
php7.1-dev \
#
......
......@@ -13,5 +13,5 @@ minimal_apt_get_install \
#
# Install composer
curl -sSL https://getcomposer.org/download/1.1.2/composer.phar -o /usr/bin/composer
curl -sSL https://getcomposer.org/download/1.3.1/composer.phar -o /usr/bin/composer
chmod +x /usr/bin/composer
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