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
source /pd_build/buildconfig
set -x
## NodeSource's Node.js repository
curl --fail -sL https://deb.nodesource.com/setup_8.x | bash -
# NodeSource's Node.js repository
# 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
apt-get remove -y --purge \
autoconf \
dpkg-dev \
file \
flex \
krb5-multidev \
......@@ -27,7 +26,6 @@ apt-get remove -y --purge \
libgd-dev \
libglib2.0-dev \
libgmp3-dev \
libgnutls-dev \
libgpg-error-dev \
libice-dev \
libidn11-dev \
......@@ -45,7 +43,6 @@ apt-get remove -y --purge \
libmysqlclient-dev \
libonig-dev \
libpcre3-dev \
libpng12-dev \
libpq-dev \
libpspell-dev \
libqdbm-dev \
......@@ -55,7 +52,6 @@ apt-get remove -y --purge \
libsctp-dev \
libsm-dev \
libsqlite3-dev \
libssl-dev \
libsystemd-dev \
libtidy-dev \
libtiff5-dev \
......@@ -88,20 +84,15 @@ apt-get remove -y --purge \
libicu-dev \
libisl15 \
libitm1 \
libkadm5clnt-mit9 \
libkadm5srv-mit9 \
libkdb5-8 \
liblsan0 \
libmagic1 \
libmpc3 \
libmpfr4 \
libmpx0 \
libp11-kit-dev \
libpam0g-dev \
libpthread-stubs0-dev \
libquadmath0 \
libreadline6-dev \
libsigsegv2 \
libstdc++-5-dev \
libtasn1-6-dev \
libtinfo-dev \
......@@ -111,7 +102,6 @@ apt-get remove -y --purge \
libxau-dev \
libxcb1-dev \
libxdmcp-dev \
linux-libc-dev \
m4 \
mlock \
nettle-dev \
......@@ -129,8 +119,8 @@ minimal_apt_get_install \
apt-get clean
apt-get -y autoremove
rm -rf \
/var/lib/apt/lists/* \
/tmp/* \
/var/tmp/* \
/usr/local/src/* \
......
......@@ -4,7 +4,7 @@ source /pd_build/buildconfig
set -x
# 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
npm install npm -g
......
......@@ -33,18 +33,16 @@ minimal_apt_get_install \
zlib1g \
zlib1g-dev \
libcurl4-openssl-dev \
libcurl3 \
libcurl3-gnutls \
libcurl4 \
libc-client-dev \
libfreetype6 \
libfreetype6-dev \
libpng12-0 \
libpng12-dev \
libpng16-16 \
libpng-dev \
libmcrypt-dev \
libmcrypt4 \
libtidy-dev \
libxslt1-dev \
libgnutls-dev \
krb5-multidev \
libapparmor-dev \
libapr1 \
......@@ -70,7 +68,7 @@ minimal_apt_get_install \
libglib2.0-dev \
libgmp3-dev \
libgpg-error-dev \
libhunspell-1.3-0 \
libhunspell-1.6-0 \
libib-util \
libice-dev \
libice6 \
......@@ -86,10 +84,11 @@ minimal_apt_get_install \
liblzma-dev \
libmagic-dev \
libmhash-dev \
libmysqlclient20 \
libmysqlclient-dev \
libodbc1 \
libonig-dev \
libonig2 \
libonig4 \
libpcre16-3 \
libpcre3-dev \
libpcre32-3 \
......@@ -111,22 +110,24 @@ minimal_apt_get_install \
libsqlite3-dev \
libsybdb5 \
libsystemd-dev \
libtidy5 \
libtiff5 \
libtiff5-dev \
libtiffxx5 \
libtimedate-perl \
libtool \
libunistring0 \
libunistring2 \
libvpx-dev \
libvpx3 \
libvpx5 \
libwebp-dev \
libwebp5 \
libwebpdemux1 \
libwebpmux1 \
libwebp6 \
libwebpdemux2 \
libwebpmux3 \
libxmlrpc-epi-dev \
libxmlrpc-epi0 \
libxmltok1 \
libxmltok1-dev \
libxslt1.1 \
libxt-dev \
libxt6 \
unixodbc \
......@@ -141,7 +142,12 @@ cd openssl-0.9.8v
make -j 10
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
tar -xvf php-5.3.29.tar.bz2
......@@ -176,8 +182,6 @@ cd php-5.3.29
--with-readline \
--enable-soap \
--enable-sockets \
--with-sqlite \
--enable-sqlite-utf8 \
--enable-wddx \
--with-xmlrpc \
--with-xsl \
......
......@@ -10,3 +10,4 @@ minimal_apt_get_install \
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/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>
ADD . /pd_build
......
......@@ -3,5 +3,11 @@ set -e
source /pd_build/buildconfig
set -x
## NodeSource's Node.js repository
curl --fail -sL https://deb.nodesource.com/setup_8.x | bash -
\ No newline at end of file
# NodeSource's Node.js repository
# 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
apt-get remove -y --purge \
autoconf \
dpkg-dev \
file \
flex \
krb5-multidev \
......@@ -27,7 +26,6 @@ apt-get remove -y --purge \
libgd-dev \
libglib2.0-dev \
libgmp3-dev \
libgnutls-dev \
libgpg-error-dev \
libice-dev \
libidn11-dev \
......@@ -45,7 +43,6 @@ apt-get remove -y --purge \
libmysqlclient-dev \
libonig-dev \
libpcre3-dev \
libpng12-dev \
libpq-dev \
libpspell-dev \
libqdbm-dev \
......@@ -55,7 +52,6 @@ apt-get remove -y --purge \
libsctp-dev \
libsm-dev \
libsqlite3-dev \
libssl-dev \
libsystemd-dev \
libtidy-dev \
libtiff5-dev \
......@@ -88,20 +84,15 @@ apt-get remove -y --purge \
libicu-dev \
libisl15 \
libitm1 \
libkadm5clnt-mit9 \
libkadm5srv-mit9 \
libkdb5-8 \
liblsan0 \
libmagic1 \
libmpc3 \
libmpfr4 \
libmpx0 \
libp11-kit-dev \
libpam0g-dev \
libpthread-stubs0-dev \
libquadmath0 \
libreadline6-dev \
libsigsegv2 \
libstdc++-5-dev \
libtasn1-6-dev \
libtinfo-dev \
......@@ -111,7 +102,6 @@ apt-get remove -y --purge \
libxau-dev \
libxcb1-dev \
libxdmcp-dev \
linux-libc-dev \
m4 \
mlock \
nettle-dev \
......@@ -129,8 +119,8 @@ minimal_apt_get_install \
apt-get clean
apt-get -y autoremove
rm -rf \
/var/lib/apt/lists/* \
/tmp/* \
/var/tmp/* \
/usr/local/src/* \
......
......@@ -4,7 +4,7 @@ source /pd_build/buildconfig
set -x
# 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
npm install npm -g
......
......@@ -33,18 +33,16 @@ minimal_apt_get_install \
zlib1g \
zlib1g-dev \
libcurl4-openssl-dev \
libcurl3 \
libcurl3-gnutls \
libcurl4 \
libc-client-dev \
libfreetype6 \
libfreetype6-dev \
libpng12-0 \
libpng12-dev \
libpng16-16 \
libpng-dev \
libmcrypt-dev \
libmcrypt4 \
libtidy-dev \
libxslt1-dev \
libgnutls-dev \
krb5-multidev \
libapparmor-dev \
libapr1 \
......@@ -70,7 +68,7 @@ minimal_apt_get_install \
libglib2.0-dev \
libgmp3-dev \
libgpg-error-dev \
libhunspell-1.3-0 \
libhunspell-1.6-0 \
libib-util \
libice-dev \
libice6 \
......@@ -86,10 +84,11 @@ minimal_apt_get_install \
liblzma-dev \
libmagic-dev \
libmhash-dev \
libmysqlclient20 \
libmysqlclient-dev \
libodbc1 \
libonig-dev \
libonig2 \
libonig4 \
libpcre16-3 \
libpcre3-dev \
libpcre32-3 \
......@@ -111,22 +110,24 @@ minimal_apt_get_install \
libsqlite3-dev \
libsybdb5 \
libsystemd-dev \
libtidy5 \
libtiff5 \
libtiff5-dev \
libtiffxx5 \
libtimedate-perl \
libtool \
libunistring0 \
libunistring2 \
libvpx-dev \
libvpx3 \
libvpx5 \
libwebp-dev \
libwebp5 \
libwebpdemux1 \
libwebpmux1 \
libwebp6 \
libwebpdemux2 \
libwebpmux3 \
libxmlrpc-epi-dev \
libxmlrpc-epi0 \
libxmltok1 \
libxmltok1-dev \
libxslt1.1 \
libxt-dev \
libxt6 \
unixodbc \
......@@ -134,6 +135,7 @@ minimal_apt_get_install \
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
tar xvf openssl-0.9.8v.tar.gz
cd openssl-0.9.8v
......@@ -141,7 +143,13 @@ cd openssl-0.9.8v
make -j 10
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
tar -xvf php-5.4.45.tar.bz2
......@@ -176,8 +184,6 @@ cd php-5.4.45
--with-readline \
--enable-soap \
--enable-sockets \
--with-sqlite \
--enable-sqlite-utf8 \
--enable-wddx \
--with-xmlrpc \
--with-xsl \
......
......@@ -10,3 +10,4 @@ minimal_apt_get_install \
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/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>
ADD . /pd_build
......
......@@ -3,5 +3,11 @@ set -e
source /pd_build/buildconfig
set -x
## NodeSource's Node.js repository
curl --fail -sL https://deb.nodesource.com/setup_8.x | bash -
\ No newline at end of file
# NodeSource's Node.js repository
# 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
apt-get remove -y --purge \
autoconf \
dpkg-dev \
file \
flex \
krb5-multidev \
......@@ -27,7 +26,6 @@ apt-get remove -y --purge \
libgd-dev \
libglib2.0-dev \
libgmp3-dev \
libgnutls-dev \
libgpg-error-dev \
libice-dev \
libidn11-dev \
......@@ -45,7 +43,6 @@ apt-get remove -y --purge \
libmysqlclient-dev \
libonig-dev \
libpcre3-dev \
libpng12-dev \
libpq-dev \
libpspell-dev \
libqdbm-dev \
......@@ -55,7 +52,6 @@ apt-get remove -y --purge \
libsctp-dev \
libsm-dev \
libsqlite3-dev \
libssl-dev \
libsystemd-dev \
libtidy-dev \
libtiff5-dev \
......@@ -89,20 +85,15 @@ apt-get remove -y --purge \
libicu-dev \
libisl15 \
libitm1 \
libkadm5clnt-mit9 \
libkadm5srv-mit9 \
libkdb5-8 \
liblsan0 \
libmagic1 \
libmpc3 \
libmpfr4 \
libmpx0 \
libp11-kit-dev \
libpam0g-dev \
libpthread-stubs0-dev \
libquadmath0 \
libreadline6-dev \
libsigsegv2 \
libstdc++-5-dev \
libtasn1-6-dev \
libtinfo-dev \
......@@ -112,7 +103,6 @@ apt-get remove -y --purge \
libxau-dev \
libxcb1-dev \
libxdmcp-dev \
linux-libc-dev \
m4 \
mlock \
nettle-dev \
......@@ -130,8 +120,8 @@ minimal_apt_get_install \
apt-get clean
apt-get -y autoremove
rm -rf \
/var/lib/apt/lists/* \
/tmp/* \
/var/tmp/* \
/usr/local/src/* \
......
......@@ -4,7 +4,7 @@ source /pd_build/buildconfig
set -x
# 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
npm install npm -g
......
......@@ -33,18 +33,16 @@ minimal_apt_get_install \
zlib1g \
zlib1g-dev \
libcurl4-openssl-dev \
libcurl3 \
libcurl3-gnutls \
libcurl4 \
libc-client-dev \
libfreetype6 \
libfreetype6-dev \
libpng12-0 \
libpng12-dev \
libpng16-16 \
libpng-dev \
libmcrypt-dev \
libmcrypt4 \
libtidy-dev \
libxslt1-dev \
libgnutls-dev \
krb5-multidev \
libapparmor-dev \
libapr1 \
......@@ -70,7 +68,7 @@ minimal_apt_get_install \
libglib2.0-dev \
libgmp3-dev \
libgpg-error-dev \
libhunspell-1.3-0 \
libhunspell-1.6-0 \
libib-util \
libice-dev \
libice6 \
......@@ -87,10 +85,11 @@ minimal_apt_get_install \
libmagic-dev \
libmemcached-dev \
libmhash-dev \
libmysqlclient20 \
libmysqlclient-dev \
libodbc1 \
libonig-dev \
libonig2 \
libonig4 \
libpcre16-3 \
libpcre3-dev \
libpcre32-3 \
......@@ -112,22 +111,24 @@ minimal_apt_get_install \
libsqlite3-dev \
libsybdb5 \
libsystemd-dev \
libtidy5 \
libtiff5 \
libtiff5-dev \
libtiffxx5 \
libtimedate-perl \
libtool \
libunistring0 \
libunistring2 \
libvpx-dev \
libvpx3 \
libvpx5 \
libwebp-dev \
libwebp5 \
libwebpdemux1 \
libwebpmux1 \
libwebp6 \
libwebpdemux2 \
libwebpmux3 \
libxmlrpc-epi-dev \
libxmlrpc-epi0 \
libxmltok1 \
libxmltok1-dev \
libxslt1.1 \
libxt-dev \
libxt6 \
unixodbc \
......@@ -142,7 +143,12 @@ cd openssl-0.9.8v
make -j 10
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.5.38.tar.bz2 -o php-5.5.38.tar.bz2
tar -xvf php-5.5.38.tar.bz2
......
......@@ -10,3 +10,4 @@ minimal_apt_get_install \
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/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>
ADD . /pd_build
......
......@@ -4,12 +4,26 @@ source /pd_build/buildconfig
set -x
## ondrej with php 5.6
echo deb http://ppa.launchpad.net/ondrej/php/ubuntu xenial main > /etc/apt/sources.list.d/php.list
echo deb http://ppa.launchpad.net/ondrej/php/ubuntu bionic main > /etc/apt/sources.list.d/php.list
minimal_apt_get_install \
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 \
#
## NodeSource's Node.js repository
curl --fail -sL https://deb.nodesource.com/setup_8.x | bash -
\ No newline at end of file
# NodeSource's Node.js repository
# disabled with switch to ubuntu 18.04 base
# curl --fail -sL https://deb.nodesource.com/setup_8.x | bash -
apt-get update
apt-get -y dist-upgrade
# 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
......@@ -4,8 +4,8 @@ source /pd_build/buildconfig
set -x
apt-get clean
apt-get -y autoremove
rm -rf \
/var/lib/apt/lists/* \
/tmp/* \
/var/tmp/* \
/usr/local/src/* \
......
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