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

[TASK] Major 2.0 tagged update to ubuntu 18.04 instead of ubuntu 16.04 base

parent f54c77ce
...@@ -3,5 +3,11 @@ set -e ...@@ -3,5 +3,11 @@ set -e
source /pd_build/buildconfig source /pd_build/buildconfig
set -x set -x
## NodeSource's Node.js repository # NodeSource's Node.js repository
curl --fail -sL https://deb.nodesource.com/setup_8.x | bash - # disabled with switch to ubuntu 18.04 base
# curl --fail -sL https://deb.nodesource.com/setup_8.x | bash -
# Set a hard IP for some typo3.org services for now until maybe anytime server team decides
# to get DNS right again
echo "136.243.44.172 review.typo3.org" >> /etc/hosts
echo "136.243.44.172 git.typo3.org" >> /etc/hosts
\ No newline at end of file
...@@ -5,7 +5,6 @@ set -x ...@@ -5,7 +5,6 @@ set -x
apt-get remove -y --purge \ apt-get remove -y --purge \
autoconf \ autoconf \
dpkg-dev \
file \ file \
flex \ flex \
krb5-multidev \ krb5-multidev \
...@@ -27,7 +26,6 @@ apt-get remove -y --purge \ ...@@ -27,7 +26,6 @@ apt-get remove -y --purge \
libgd-dev \ libgd-dev \
libglib2.0-dev \ libglib2.0-dev \
libgmp3-dev \ libgmp3-dev \
libgnutls-dev \
libgpg-error-dev \ libgpg-error-dev \
libice-dev \ libice-dev \
libidn11-dev \ libidn11-dev \
...@@ -45,7 +43,6 @@ apt-get remove -y --purge \ ...@@ -45,7 +43,6 @@ apt-get remove -y --purge \
libmysqlclient-dev \ libmysqlclient-dev \
libonig-dev \ libonig-dev \
libpcre3-dev \ libpcre3-dev \
libpng12-dev \
libpq-dev \ libpq-dev \
libpspell-dev \ libpspell-dev \
libqdbm-dev \ libqdbm-dev \
...@@ -55,7 +52,6 @@ apt-get remove -y --purge \ ...@@ -55,7 +52,6 @@ apt-get remove -y --purge \
libsctp-dev \ libsctp-dev \
libsm-dev \ libsm-dev \
libsqlite3-dev \ libsqlite3-dev \
libssl-dev \
libsystemd-dev \ libsystemd-dev \
libtidy-dev \ libtidy-dev \
libtiff5-dev \ libtiff5-dev \
...@@ -88,20 +84,15 @@ apt-get remove -y --purge \ ...@@ -88,20 +84,15 @@ apt-get remove -y --purge \
libicu-dev \ libicu-dev \
libisl15 \ libisl15 \
libitm1 \ libitm1 \
libkadm5clnt-mit9 \
libkadm5srv-mit9 \
libkdb5-8 \
liblsan0 \ liblsan0 \
libmagic1 \ libmagic1 \
libmpc3 \ libmpc3 \
libmpfr4 \
libmpx0 \ libmpx0 \
libp11-kit-dev \ libp11-kit-dev \
libpam0g-dev \ libpam0g-dev \
libpthread-stubs0-dev \ libpthread-stubs0-dev \
libquadmath0 \ libquadmath0 \
libreadline6-dev \ libreadline6-dev \
libsigsegv2 \
libstdc++-5-dev \ libstdc++-5-dev \
libtasn1-6-dev \ libtasn1-6-dev \
libtinfo-dev \ libtinfo-dev \
...@@ -111,7 +102,6 @@ apt-get remove -y --purge \ ...@@ -111,7 +102,6 @@ apt-get remove -y --purge \
libxau-dev \ libxau-dev \
libxcb1-dev \ libxcb1-dev \
libxdmcp-dev \ libxdmcp-dev \
linux-libc-dev \
m4 \ m4 \
mlock \ mlock \
nettle-dev \ nettle-dev \
...@@ -129,8 +119,8 @@ minimal_apt_get_install \ ...@@ -129,8 +119,8 @@ minimal_apt_get_install \
apt-get clean apt-get clean
apt-get -y autoremove
rm -rf \ rm -rf \
/var/lib/apt/lists/* \
/tmp/* \ /tmp/* \
/var/tmp/* \ /var/tmp/* \
/usr/local/src/* \ /usr/local/src/* \
......
...@@ -4,7 +4,7 @@ source /pd_build/buildconfig ...@@ -4,7 +4,7 @@ source /pd_build/buildconfig
set -x set -x
# Install Node.js and some packages to successfully compile stuff # Install Node.js and some packages to successfully compile stuff
minimal_apt_get_install nodejs make g++ minimal_apt_get_install npm nodejs make g++
# And update npm afterwards # And update npm afterwards
npm install npm -g npm install npm -g
......
...@@ -33,18 +33,16 @@ minimal_apt_get_install \ ...@@ -33,18 +33,16 @@ minimal_apt_get_install \
zlib1g \ zlib1g \
zlib1g-dev \ zlib1g-dev \
libcurl4-openssl-dev \ libcurl4-openssl-dev \
libcurl3 \ libcurl4 \
libcurl3-gnutls \
libc-client-dev \ libc-client-dev \
libfreetype6 \ libfreetype6 \
libfreetype6-dev \ libfreetype6-dev \
libpng12-0 \ libpng16-16 \
libpng12-dev \ libpng-dev \
libmcrypt-dev \ libmcrypt-dev \
libmcrypt4 \ libmcrypt4 \
libtidy-dev \ libtidy-dev \
libxslt1-dev \ libxslt1-dev \
libgnutls-dev \
krb5-multidev \ krb5-multidev \
libapparmor-dev \ libapparmor-dev \
libapr1 \ libapr1 \
...@@ -70,7 +68,7 @@ minimal_apt_get_install \ ...@@ -70,7 +68,7 @@ minimal_apt_get_install \
libglib2.0-dev \ libglib2.0-dev \
libgmp3-dev \ libgmp3-dev \
libgpg-error-dev \ libgpg-error-dev \
libhunspell-1.3-0 \ libhunspell-1.6-0 \
libib-util \ libib-util \
libice-dev \ libice-dev \
libice6 \ libice6 \
...@@ -86,10 +84,11 @@ minimal_apt_get_install \ ...@@ -86,10 +84,11 @@ minimal_apt_get_install \
liblzma-dev \ liblzma-dev \
libmagic-dev \ libmagic-dev \
libmhash-dev \ libmhash-dev \
libmysqlclient20 \
libmysqlclient-dev \ libmysqlclient-dev \
libodbc1 \ libodbc1 \
libonig-dev \ libonig-dev \
libonig2 \ libonig4 \
libpcre16-3 \ libpcre16-3 \
libpcre3-dev \ libpcre3-dev \
libpcre32-3 \ libpcre32-3 \
...@@ -111,22 +110,24 @@ minimal_apt_get_install \ ...@@ -111,22 +110,24 @@ minimal_apt_get_install \
libsqlite3-dev \ libsqlite3-dev \
libsybdb5 \ libsybdb5 \
libsystemd-dev \ libsystemd-dev \
libtidy5 \
libtiff5 \ libtiff5 \
libtiff5-dev \ libtiff5-dev \
libtiffxx5 \ libtiffxx5 \
libtimedate-perl \ libtimedate-perl \
libtool \ libtool \
libunistring0 \ libunistring2 \
libvpx-dev \ libvpx-dev \
libvpx3 \ libvpx5 \
libwebp-dev \ libwebp-dev \
libwebp5 \ libwebp6 \
libwebpdemux1 \ libwebpdemux2 \
libwebpmux1 \ libwebpmux3 \
libxmlrpc-epi-dev \ libxmlrpc-epi-dev \
libxmlrpc-epi0 \ libxmlrpc-epi0 \
libxmltok1 \ libxmltok1 \
libxmltok1-dev \ libxmltok1-dev \
libxslt1.1 \
libxt-dev \ libxt-dev \
libxt6 \ libxt6 \
unixodbc \ unixodbc \
...@@ -141,7 +142,12 @@ cd openssl-0.9.8v ...@@ -141,7 +142,12 @@ cd openssl-0.9.8v
make -j 10 make -j 10
make install_sw make install_sw
cd .. # configure expects easy.h from curl in /usr/include and setting a path with-curl= does not work.
# link it ...
cd /usr/include
ln -s x86_64-linux-gnu/curl
cd /usr/local/src
curl -SL --progress-bar http://in1.php.net/distributions/php-5.3.29.tar.bz2 -o php-5.3.29.tar.bz2 curl -SL --progress-bar http://in1.php.net/distributions/php-5.3.29.tar.bz2 -o php-5.3.29.tar.bz2
tar -xvf php-5.3.29.tar.bz2 tar -xvf php-5.3.29.tar.bz2
...@@ -176,8 +182,6 @@ cd php-5.3.29 ...@@ -176,8 +182,6 @@ cd php-5.3.29
--with-readline \ --with-readline \
--enable-soap \ --enable-soap \
--enable-sockets \ --enable-sockets \
--with-sqlite \
--enable-sqlite-utf8 \
--enable-wddx \ --enable-wddx \
--with-xmlrpc \ --with-xmlrpc \
--with-xsl \ --with-xsl \
......
...@@ -10,3 +10,4 @@ minimal_apt_get_install \ ...@@ -10,3 +10,4 @@ minimal_apt_get_install \
cp -a /pd_build/runit/redis-server /etc/service/redis-server cp -a /pd_build/runit/redis-server /etc/service/redis-server
sed -i 's/daemonize yes/daemonize no/' /etc/redis/redis.conf sed -i 's/daemonize yes/daemonize no/' /etc/redis/redis.conf
sed -i 's/bind 127.0.0.1 ::1/bind 127.0.0.1/' /etc/redis/redis.conf
FROM typo3gmbh/baseimage:1.0 FROM typo3gmbh/baseimage:2.0
MAINTAINER TYPO3 GmbH <info@typo3.com> MAINTAINER TYPO3 GmbH <info@typo3.com>
ADD . /pd_build ADD . /pd_build
......
...@@ -3,5 +3,11 @@ set -e ...@@ -3,5 +3,11 @@ set -e
source /pd_build/buildconfig source /pd_build/buildconfig
set -x set -x
## NodeSource's Node.js repository # NodeSource's Node.js repository
curl --fail -sL https://deb.nodesource.com/setup_8.x | bash - # disabled with switch to ubuntu 18.04 base
\ No newline at end of file # curl --fail -sL https://deb.nodesource.com/setup_8.x | bash -
# Set a hard IP for some typo3.org services for now until maybe anytime server team decides
# to get DNS right again
echo "136.243.44.172 review.typo3.org" >> /etc/hosts
echo "136.243.44.172 git.typo3.org" >> /etc/hosts
\ No newline at end of file
...@@ -5,7 +5,6 @@ set -x ...@@ -5,7 +5,6 @@ set -x
apt-get remove -y --purge \ apt-get remove -y --purge \
autoconf \ autoconf \
dpkg-dev \
file \ file \
flex \ flex \
krb5-multidev \ krb5-multidev \
...@@ -27,7 +26,6 @@ apt-get remove -y --purge \ ...@@ -27,7 +26,6 @@ apt-get remove -y --purge \
libgd-dev \ libgd-dev \
libglib2.0-dev \ libglib2.0-dev \
libgmp3-dev \ libgmp3-dev \
libgnutls-dev \
libgpg-error-dev \ libgpg-error-dev \
libice-dev \ libice-dev \
libidn11-dev \ libidn11-dev \
...@@ -45,7 +43,6 @@ apt-get remove -y --purge \ ...@@ -45,7 +43,6 @@ apt-get remove -y --purge \
libmysqlclient-dev \ libmysqlclient-dev \
libonig-dev \ libonig-dev \
libpcre3-dev \ libpcre3-dev \
libpng12-dev \
libpq-dev \ libpq-dev \
libpspell-dev \ libpspell-dev \
libqdbm-dev \ libqdbm-dev \
...@@ -55,7 +52,6 @@ apt-get remove -y --purge \ ...@@ -55,7 +52,6 @@ apt-get remove -y --purge \
libsctp-dev \ libsctp-dev \
libsm-dev \ libsm-dev \
libsqlite3-dev \ libsqlite3-dev \
libssl-dev \
libsystemd-dev \ libsystemd-dev \
libtidy-dev \ libtidy-dev \
libtiff5-dev \ libtiff5-dev \
...@@ -88,20 +84,15 @@ apt-get remove -y --purge \ ...@@ -88,20 +84,15 @@ apt-get remove -y --purge \
libicu-dev \ libicu-dev \
libisl15 \ libisl15 \
libitm1 \ libitm1 \
libkadm5clnt-mit9 \
libkadm5srv-mit9 \
libkdb5-8 \
liblsan0 \ liblsan0 \
libmagic1 \ libmagic1 \
libmpc3 \ libmpc3 \
libmpfr4 \
libmpx0 \ libmpx0 \
libp11-kit-dev \ libp11-kit-dev \
libpam0g-dev \ libpam0g-dev \
libpthread-stubs0-dev \ libpthread-stubs0-dev \
libquadmath0 \ libquadmath0 \
libreadline6-dev \ libreadline6-dev \
libsigsegv2 \
libstdc++-5-dev \ libstdc++-5-dev \
libtasn1-6-dev \ libtasn1-6-dev \
libtinfo-dev \ libtinfo-dev \
...@@ -111,7 +102,6 @@ apt-get remove -y --purge \ ...@@ -111,7 +102,6 @@ apt-get remove -y --purge \
libxau-dev \ libxau-dev \
libxcb1-dev \ libxcb1-dev \
libxdmcp-dev \ libxdmcp-dev \
linux-libc-dev \
m4 \ m4 \
mlock \ mlock \
nettle-dev \ nettle-dev \
...@@ -129,8 +119,8 @@ minimal_apt_get_install \ ...@@ -129,8 +119,8 @@ minimal_apt_get_install \
apt-get clean apt-get clean
apt-get -y autoremove
rm -rf \ rm -rf \
/var/lib/apt/lists/* \
/tmp/* \ /tmp/* \
/var/tmp/* \ /var/tmp/* \
/usr/local/src/* \ /usr/local/src/* \
......
...@@ -4,7 +4,7 @@ source /pd_build/buildconfig ...@@ -4,7 +4,7 @@ source /pd_build/buildconfig
set -x set -x
# Install Node.js and some packages to successfully compile stuff # Install Node.js and some packages to successfully compile stuff
minimal_apt_get_install nodejs make g++ minimal_apt_get_install npm nodejs make g++
# And update npm afterwards # And update npm afterwards
npm install npm -g npm install npm -g
......
...@@ -33,18 +33,16 @@ minimal_apt_get_install \ ...@@ -33,18 +33,16 @@ minimal_apt_get_install \
zlib1g \ zlib1g \
zlib1g-dev \ zlib1g-dev \
libcurl4-openssl-dev \ libcurl4-openssl-dev \
libcurl3 \ libcurl4 \
libcurl3-gnutls \
libc-client-dev \ libc-client-dev \
libfreetype6 \ libfreetype6 \
libfreetype6-dev \ libfreetype6-dev \
libpng12-0 \ libpng16-16 \
libpng12-dev \ libpng-dev \
libmcrypt-dev \ libmcrypt-dev \
libmcrypt4 \ libmcrypt4 \
libtidy-dev \ libtidy-dev \
libxslt1-dev \ libxslt1-dev \
libgnutls-dev \
krb5-multidev \ krb5-multidev \
libapparmor-dev \ libapparmor-dev \
libapr1 \ libapr1 \
...@@ -70,7 +68,7 @@ minimal_apt_get_install \ ...@@ -70,7 +68,7 @@ minimal_apt_get_install \
libglib2.0-dev \ libglib2.0-dev \
libgmp3-dev \ libgmp3-dev \
libgpg-error-dev \ libgpg-error-dev \
libhunspell-1.3-0 \ libhunspell-1.6-0 \
libib-util \ libib-util \
libice-dev \ libice-dev \
libice6 \ libice6 \
...@@ -86,10 +84,11 @@ minimal_apt_get_install \ ...@@ -86,10 +84,11 @@ minimal_apt_get_install \
liblzma-dev \ liblzma-dev \
libmagic-dev \ libmagic-dev \
libmhash-dev \ libmhash-dev \
libmysqlclient20 \
libmysqlclient-dev \ libmysqlclient-dev \
libodbc1 \ libodbc1 \
libonig-dev \ libonig-dev \
libonig2 \ libonig4 \
libpcre16-3 \ libpcre16-3 \
libpcre3-dev \ libpcre3-dev \
libpcre32-3 \ libpcre32-3 \
...@@ -111,22 +110,24 @@ minimal_apt_get_install \ ...@@ -111,22 +110,24 @@ minimal_apt_get_install \
libsqlite3-dev \ libsqlite3-dev \
libsybdb5 \ libsybdb5 \
libsystemd-dev \ libsystemd-dev \
libtidy5 \
libtiff5 \ libtiff5 \
libtiff5-dev \ libtiff5-dev \
libtiffxx5 \ libtiffxx5 \
libtimedate-perl \ libtimedate-perl \
libtool \ libtool \
libunistring0 \ libunistring2 \
libvpx-dev \ libvpx-dev \
libvpx3 \ libvpx5 \
libwebp-dev \ libwebp-dev \
libwebp5 \ libwebp6 \
libwebpdemux1 \ libwebpdemux2 \
libwebpmux1 \ libwebpmux3 \
libxmlrpc-epi-dev \ libxmlrpc-epi-dev \
libxmlrpc-epi0 \ libxmlrpc-epi0 \
libxmltok1 \ libxmltok1 \
libxmltok1-dev \ libxmltok1-dev \
libxslt1.1 \
libxt-dev \ libxt-dev \
libxt6 \ libxt6 \
unixodbc \ unixodbc \
...@@ -134,6 +135,7 @@ minimal_apt_get_install \ ...@@ -134,6 +135,7 @@ minimal_apt_get_install \
uuid-dev \ uuid-dev \
# #
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 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 tar xvf openssl-0.9.8v.tar.gz
cd openssl-0.9.8v cd openssl-0.9.8v
...@@ -141,7 +143,13 @@ cd openssl-0.9.8v ...@@ -141,7 +143,13 @@ cd openssl-0.9.8v
make -j 10 make -j 10
make install_sw make install_sw
cd .. # configure expects easy.h from curl in /usr/include and setting a path with-curl= does not work.
# link it ...
cd /usr/include
ln -s x86_64-linux-gnu/curl
cd /usr/local/src
curl -SL --progress-bar http://in1.php.net/distributions/php-5.4.45.tar.bz2 -o php-5.4.45.tar.bz2 curl -SL --progress-bar http://in1.php.net/distributions/php-5.4.45.tar.bz2 -o php-5.4.45.tar.bz2
tar -xvf php-5.4.45.tar.bz2 tar -xvf php-5.4.45.tar.bz2
...@@ -176,8 +184,6 @@ cd php-5.4.45 ...@@ -176,8 +184,6 @@ cd php-5.4.45
--with-readline \ --with-readline \
--enable-soap \ --enable-soap \
--enable-sockets \ --enable-sockets \
--with-sqlite \
--enable-sqlite-utf8 \
--enable-wddx \ --enable-wddx \
--with-xmlrpc \ --with-xmlrpc \
--with-xsl \ --with-xsl \
......
...@@ -10,3 +10,4 @@ minimal_apt_get_install \ ...@@ -10,3 +10,4 @@ minimal_apt_get_install \
cp -a /pd_build/runit/redis-server /etc/service/redis-server cp -a /pd_build/runit/redis-server /etc/service/redis-server
sed -i 's/daemonize yes/daemonize no/' /etc/redis/redis.conf sed -i 's/daemonize yes/daemonize no/' /etc/redis/redis.conf
sed -i 's/bind 127.0.0.1 ::1/bind 127.0.0.1/' /etc/redis/redis.conf
FROM typo3gmbh/baseimage:1.0 FROM typo3gmbh/baseimage:2.0
MAINTAINER TYPO3 GmbH <info@typo3.com> MAINTAINER TYPO3 GmbH <info@typo3.com>
ADD . /pd_build ADD . /pd_build
......
...@@ -3,5 +3,11 @@ set -e ...@@ -3,5 +3,11 @@ set -e
source /pd_build/buildconfig source /pd_build/buildconfig
set -x set -x
## NodeSource's Node.js repository # NodeSource's Node.js repository
curl --fail -sL https://deb.nodesource.com/setup_8.x | bash - # disabled with switch to ubuntu 18.04 base
\ No newline at end of file # curl --fail -sL https://deb.nodesource.com/setup_8.x | bash -
# Set a hard IP for some typo3.org services for now until maybe anytime server team decides
# to get DNS right again
echo "136.243.44.172 review.typo3.org" >> /etc/hosts
echo "136.243.44.172 git. typo3.org" >> /etc/hosts
\ No newline at end of file
...@@ -5,7 +5,6 @@ set -x ...@@ -5,7 +5,6 @@ set -x
apt-get remove -y --purge \ apt-get remove -y --purge \
autoconf \ autoconf \
dpkg-dev \
file \ file \
flex \ flex \
krb5-multidev \ krb5-multidev \
...@@ -27,7 +26,6 @@ apt-get remove -y --purge \ ...@@ -27,7 +26,6 @@ apt-get remove -y --purge \
libgd-dev \ libgd-dev \
libglib2.0-dev \ libglib2.0-dev \
libgmp3-dev \ libgmp3-dev \
libgnutls-dev \
libgpg-error-dev \ libgpg-error-dev \
libice-dev \ libice-dev \
libidn11-dev \ libidn11-dev \
...@@ -45,7 +43,6 @@ apt-get remove -y --purge \ ...@@ -45,7 +43,6 @@ apt-get remove -y --purge \
libmysqlclient-dev \ libmysqlclient-dev \
libonig-dev \ libonig-dev \
libpcre3-dev \ libpcre3-dev \
libpng12-dev \
libpq-dev \ libpq-dev \
libpspell-dev \ libpspell-dev \
libqdbm-dev \