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
...@@ -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
......
...@@ -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,13 +3,7 @@ set -e ...@@ -3,13 +3,7 @@ set -e
source /pd_build/buildconfig source /pd_build/buildconfig
set -x set -x
# xvfb and some hard dependencies of firefox # xvfb and some hard dependencies of chrome
minimal_apt_get_install \ minimal_apt_get_install \
xvfb \
gconf2 \
google-chrome-stable \ google-chrome-stable \
# #
mkdir /tmp/.X11-unix
chmod 1777 /tmp/.X11-unix
chown root /tmp/.X11-unix/
\ No newline at end of file
...@@ -3,6 +3,19 @@ set -e ...@@ -3,6 +3,19 @@ set -e
source /pd_build/buildconfig source /pd_build/buildconfig
set -x 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 # mssql and tools
# curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - # 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 # 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 - ...@@ -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 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 # 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 -
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
...@@ -8,23 +8,18 @@ apt-get remove -y --purge \ ...@@ -8,23 +8,18 @@ apt-get remove -y --purge \
autoconf \ autoconf \
automake \ automake \
autotools-dev \ autotools-dev \
build-essential \
dpkg-dev \
file \ file \
libpcre16-3 \ libpcre16-3 \
libpcre3-dev \ libpcre3-dev \
libpcre32-3 \ libpcre32-3 \
libpcrecpp0v5 \ libpcrecpp0v5 \
libquadmath0 \ libquadmath0 \
libssl-dev \
libtool \ libtool \
libtsan0 \ libtsan0 \
libubsan0 \ libubsan0 \
linux-libc-dev \
m4 \ m4 \
php7.0-dev \ php7.0-dev \
shtool \ shtool \
zlib1g-dev \
# #
# but keep make and g++ ... to not confuse with above list, just install again if needed # but keep make and g++ ... to not confuse with above list, just install again if needed
...@@ -33,8 +28,8 @@ minimal_apt_get_install \ ...@@ -33,8 +28,8 @@ minimal_apt_get_install \
g++ g++
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
......
...@@ -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
...@@ -2,13 +2,13 @@ ...@@ -2,13 +2,13 @@
rm -rf /var/lib/postgresql/* rm -rf /var/lib/postgresql/*
chmod 700 /var/lib/postgresql/ chmod 700 /var/lib/postgresql/
chown postgres:postgres /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 bamboo;" > ./init.sql
echo "CREATE USER root;" >> ./init.sql echo "CREATE USER root;" >> ./init.sql
echo "ALTER USER bamboo SUPERUSER;" >> ./init.sql echo "ALTER USER bamboo SUPERUSER;" >> ./init.sql
echo "ALTER USER root 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 rm ./init.sql
# more opts to check # more opts to check
...@@ -16,4 +16,4 @@ rm ./init.sql ...@@ -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 # --wal-buffers=32kB --checkpoint-segments=64 --seq-page-cost=0.01 --random-page-cost=0.01 --effective-cache-size=64kB
exec 2>&1 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
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,13 +3,7 @@ set -e ...@@ -3,13 +3,7 @@ set -e
source /pd_build/buildconfig source /pd_build/buildconfig
set -x set -x
# xvfb and some hard dependencies of firefox # xvfb and some hard dependencies of chrome
minimal_apt_get_install \ minimal_apt_get_install \
xvfb \
gconf2 \
google-chrome-stable \ google-chrome-stable \
# #
mkdir /tmp/.X11-unix
chmod 1777 /tmp/.X11-unix
chown root /tmp/.X11-unix/
\ No newline at end of file
...@@ -4,7 +4,12 @@ source /pd_build/buildconfig ...@@ -4,7 +4,12 @@ source /pd_build/buildconfig
set -x set -x
# ondrej with php 7.1 # 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. # 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 \ 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 - ...@@ -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 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 # 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 -
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
...@@ -8,21 +8,16 @@ apt-get remove -y --purge \ ...@@ -8,21 +8,16 @@ apt-get remove -y --purge \
autoconf \ autoconf \
automake \ automake \
autotools-dev \ autotools-dev \
build-essential \
dpkg-dev \
file \ file \
libpcre16-3 \ libpcre16-3 \
libpcre3-dev \ libpcre3-dev \
libpcre32-3 \ libpcre32-3 \
libpcrecpp0v5 \ libpcrecpp0v5 \
libquadmath0 \ libquadmath0 \
libssl-dev \
libtool \ libtool \
linux-libc-dev \
m4 \ m4 \
php7.1-dev \ php7.1-dev \
shtool \ shtool \
zlib1g-dev \
# #
# but keep make and g++ ... to not confuse with above list, just install again if needed # but keep make and g++ ... to not confuse with above list, just install again if needed
...@@ -32,8 +27,8 @@ minimal_apt_get_install \ ...@@ -32,8 +27,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
......
...@@ -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
...@@ -2,13 +2,13 @@ ...@@ -2,13 +2,13 @@
rm -rf /var/lib/postgresql/* rm -rf /var/lib/postgresql/*
chmod 700 /var/lib/postgresql/ chmod 700 /var/lib/postgresql/
chown postgres:postgres /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 bamboo;" > ./init.sql
echo "CREATE USER root;" >> ./init.sql echo "CREATE USER root;" >> ./init.sql
echo "ALTER USER bamboo SUPERUSER;" >> ./init.sql echo "ALTER USER bamboo SUPERUSER;" >> ./init.sql
echo "ALTER USER root 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 rm ./init.sql
# more opts to check # more opts to check
...@@ -16,4 +16,4 @@ rm ./init.sql ...@@ -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 # --wal-buffers=32kB --checkpoint-segments=64 --seq-page-cost=0.01 --random-page-cost=0.01 --effective-cache-size=64kB
exec 2>&1 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
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,13 +3,7 @@ set -e ...@@ -3,13 +3,7 @@ set -e
source /pd_build/buildconfig source /pd_build/buildconfig
set -x set -x
# xvfb and some hard dependencies of firefox # xvfb and some hard dependencies of chrome
minimal_apt_get_install \ minimal_apt_get_install \
xvfb \
gconf2 \
google-chrome-stable \ google-chrome-stable \
# #
mkdir /tmp/.X11-unix
chmod 1777 /tmp/.X11-unix
chown root /tmp/.X11-unix/
\ No newline at end of file
...@@ -4,13 +4,19 @@ source /pd_build/buildconfig ...@@ -4,13 +4,19 @@ source /pd_build/buildconfig
set -x set -x
# ondrej with php 7.2 # 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. minimal_apt_get_install \
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys \ dirmngr \
E5267A6C \ 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 # mssql and tools
# curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - # 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 # 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 - ...@@ -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 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 # 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 -
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
...@@ -8,21 +8,16 @@ apt-get remove -y --purge \ ...@@ -8,21 +8,16 @@ apt-get remove -y --purge \
autoconf \ autoconf \
automake \ automake \
autotools-dev \ autotools-dev \
build-essential \
dpkg-dev \
file \ file \
libpcre16-3 \ libpcre16-3 \
libpcre3-dev \ libpcre3-dev \
libpcre32-3 \ libpcre32-3 \
libpcrecpp0v5 \ libpcrecpp0v5 \
libquadmath0 \ libquadmath0 \
libssl-dev \
libtool \ libtool \
linux-libc-dev \
m4 \ m4 \
php7.1-dev \ php7.2-dev \
shtool \ shtool \
zlib1g-dev \
# #
# but keep make and g++ ... to not confuse with above list, just install again if needed # but keep make and g++ ... to not confuse with above list, just install again if needed
...@@ -32,8 +27,8 @@ minimal_apt_get_install \ ...@@ -32,8 +27,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/* \
......
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