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

php56/nodejs.sh

@@ -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

php56/redis-server.sh

@@ -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

php70/Dockerfile

-FROM typo3gmbh/baseimage:1.0
+FROM typo3gmbh/baseimage:2.0
 MAINTAINER TYPO3 GmbH <info@typo3.com>
 
 ADD . /pd_build

php70/chrome.sh

@@ -3,13 +3,7 @@ set -e
 source /pd_build/buildconfig
 set -x
 
-# xvfb and some hard dependencies of firefox
+# xvfb and some hard dependencies of chrome
 minimal_apt_get_install \
-  xvfb \
-  gconf2 \
   google-chrome-stable \
   #
-
-mkdir /tmp/.X11-unix
-chmod 1777 /tmp/.X11-unix
-chown root /tmp/.X11-unix/
\ No newline at end of file

php70/enable_repos.sh

@@ -3,6 +3,19 @@ set -e
 source /pd_build/buildconfig
 set -x
 
+## ondrej with php 7.0
+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 \
+  #
+
 # mssql and tools
 # curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add -
 # curl https://packages.microsoft.com/config/ubuntu/16.04/mssql-server.list | tee /etc/apt/sources.list.d/mssql-server.list
@@ -13,4 +26,13 @@ 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_8.x | bash -
\ No newline at end of file
+# 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

php70/finalize.sh

@@ -8,23 +8,18 @@ apt-get remove -y --purge \
   autoconf \
   automake \
   autotools-dev \
-  build-essential \
-  dpkg-dev \
   file \
   libpcre16-3 \
   libpcre3-dev \
   libpcre32-3 \
   libpcrecpp0v5 \
   libquadmath0 \
-  libssl-dev \
   libtool \
   libtsan0 \
   libubsan0 \
-  linux-libc-dev \
   m4 \
   php7.0-dev \
   shtool \
-  zlib1g-dev \
   #
 
 # but keep make and g++ ... to not confuse with above list, just install again if needed
@@ -33,8 +28,8 @@ minimal_apt_get_install \
   g++
 
 apt-get clean
+apt-get -y autoremove
 rm -rf \
-	/var/lib/apt/lists/* \
 	/tmp/* \
 	/var/tmp/* \
 	/usr/local/src/* \

php70/nodejs.sh

@@ -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

php70/redis-server.sh

@@ -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

php70/runit/postgres/run

@@ -2,13 +2,13 @@
 rm -rf /var/lib/postgresql/*
 chmod 700 /var/lib/postgresql/
 chown postgres:postgres /var/lib/postgresql/
-su postgres -c "/usr/lib/postgresql/9.5/bin/initdb --pgdata=/var/lib/postgresql --encoding=UTF8 --no-locale"
+su postgres -c "/usr/lib/postgresql/10/bin/initdb --pgdata=/var/lib/postgresql --encoding=UTF8 --no-locale"
 
 echo "CREATE USER bamboo;" > ./init.sql
 echo "CREATE USER root;" >> ./init.sql
 echo "ALTER USER bamboo SUPERUSER;" >> ./init.sql
 echo "ALTER USER root SUPERUSER;" >> ./init.sql
-su postgres -c '/usr/lib/postgresql/9.5/bin/postgres --single -D /var/lib/postgresql < ./init.sql'
+su postgres -c '/usr/lib/postgresql/10/bin/postgres --single -D /var/lib/postgresql < ./init.sql'
 rm ./init.sql
 
 # more opts to check
@@ -16,4 +16,4 @@ rm ./init.sql
 # --wal-buffers=32kB --checkpoint-segments=64 --seq-page-cost=0.01 --random-page-cost=0.01 --effective-cache-size=64kB
 
 exec 2>&1
-exec chpst -u postgres /usr/lib/postgresql/9.5/bin/postgres -D /var/lib/postgresql
+exec chpst -u postgres /usr/lib/postgresql/10/bin/postgres -D /var/lib/postgresql

php71/Dockerfile

-FROM typo3gmbh/baseimage:1.0
+FROM typo3gmbh/baseimage:2.0
 MAINTAINER TYPO3 GmbH <info@typo3.com>
 
 ADD . /pd_build

php71/chrome.sh

@@ -3,13 +3,7 @@ set -e
 source /pd_build/buildconfig
 set -x
 
-# xvfb and some hard dependencies of firefox
+# xvfb and some hard dependencies of chrome
 minimal_apt_get_install \
-  xvfb \
-  gconf2 \
   google-chrome-stable \
   #
-
-mkdir /tmp/.X11-unix
-chmod 1777 /tmp/.X11-unix
-chown root /tmp/.X11-unix/
\ No newline at end of file

php71/enable_repos.sh

@@ -4,7 +4,12 @@ source /pd_build/buildconfig
 set -x
 
 # ondrej with php 7.1
-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 \
@@ -21,4 +26,13 @@ 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_8.x | bash -
\ No newline at end of file
+# 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

php71/finalize.sh

@@ -8,21 +8,16 @@ apt-get remove -y --purge \
   autoconf \
   automake \
   autotools-dev \
-  build-essential \
-  dpkg-dev \
   file \
   libpcre16-3 \
   libpcre3-dev \
   libpcre32-3 \
   libpcrecpp0v5 \
   libquadmath0 \
-  libssl-dev \
   libtool \
-  linux-libc-dev \
   m4 \
   php7.1-dev \
   shtool \
-  zlib1g-dev \
   #
 
 # but keep make and g++ ... to not confuse with above list, just install again if needed
@@ -32,8 +27,8 @@ minimal_apt_get_install \
 
 
 apt-get clean
+apt-get -y autoremove
 rm -rf \
-	/var/lib/apt/lists/* \
 	/tmp/* \
 	/var/tmp/* \
 	/usr/local/src/* \

php71/nodejs.sh

@@ -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

php71/redis-server.sh

@@ -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

php71/runit/postgres/run

@@ -2,13 +2,13 @@
 rm -rf /var/lib/postgresql/*
 chmod 700 /var/lib/postgresql/
 chown postgres:postgres /var/lib/postgresql/
-su postgres -c "/usr/lib/postgresql/9.5/bin/initdb --pgdata=/var/lib/postgresql --encoding=UTF8 --no-locale"
+su postgres -c "/usr/lib/postgresql/10/bin/initdb --pgdata=/var/lib/postgresql --encoding=UTF8 --no-locale"
 
 echo "CREATE USER bamboo;" > ./init.sql
 echo "CREATE USER root;" >> ./init.sql
 echo "ALTER USER bamboo SUPERUSER;" >> ./init.sql
 echo "ALTER USER root SUPERUSER;" >> ./init.sql
-su postgres -c '/usr/lib/postgresql/9.5/bin/postgres --single -D /var/lib/postgresql < ./init.sql'
+su postgres -c '/usr/lib/postgresql/10/bin/postgres --single -D /var/lib/postgresql < ./init.sql'
 rm ./init.sql
 
 # more opts to check
@@ -16,4 +16,4 @@ rm ./init.sql
 # --wal-buffers=32kB --checkpoint-segments=64 --seq-page-cost=0.01 --random-page-cost=0.01 --effective-cache-size=64kB
 
 exec 2>&1
-exec chpst -u postgres /usr/lib/postgresql/9.5/bin/postgres -D /var/lib/postgresql
+exec chpst -u postgres /usr/lib/postgresql/10/bin/postgres -D /var/lib/postgresql

php72/Dockerfile

-FROM typo3gmbh/baseimage:1.0
+FROM typo3gmbh/baseimage:2.0
 MAINTAINER TYPO3 GmbH <info@typo3.com>
 
 ADD . /pd_build

php72/chrome.sh

@@ -3,13 +3,7 @@ set -e
 source /pd_build/buildconfig
 set -x
 
-# xvfb and some hard dependencies of firefox
+# xvfb and some hard dependencies of chrome
 minimal_apt_get_install \
-  xvfb \
-  gconf2 \
   google-chrome-stable \
   #
-
-mkdir /tmp/.X11-unix
-chmod 1777 /tmp/.X11-unix
-chown root /tmp/.X11-unix/
\ No newline at end of file

php72/enable_repos.sh

@@ -4,13 +4,19 @@ source /pd_build/buildconfig
 set -x
 
 # ondrej with php 7.2
-echo deb http://ppa.launchpad.net/ondrej/php/ubuntu xenial main > /etc/apt/sources.list.d/php.list
+# now native in ubuntu 18.04 bionic
+# 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 \
+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 \
+#  #
+
 # mssql and tools
 # curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add -
 # curl https://packages.microsoft.com/config/ubuntu/16.04/mssql-server.list | tee /etc/apt/sources.list.d/mssql-server.list
@@ -21,4 +27,13 @@ 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_8.x | bash -
\ No newline at end of file
+# 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

php72/finalize.sh

@@ -8,21 +8,16 @@ apt-get remove -y --purge \
   autoconf \
   automake \
   autotools-dev \
-  build-essential \
-  dpkg-dev \
   file \
   libpcre16-3 \
   libpcre3-dev \
   libpcre32-3 \
   libpcrecpp0v5 \
   libquadmath0 \
-  libssl-dev \
   libtool \
-  linux-libc-dev \
   m4 \
-  php7.1-dev \
+  php7.2-dev \
   shtool \
-  zlib1g-dev \
   #
 
 # but keep make and g++ ... to not confuse with above list, just install again if needed
@@ -32,8 +27,8 @@ minimal_apt_get_install \
 
 
 apt-get clean
+apt-get -y autoremove
 rm -rf \
-	/var/lib/apt/lists/* \
 	/tmp/* \
 	/var/tmp/* \
 	/usr/local/src/* \