Skip to content
GitLab
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
Hide whitespace changes
Inline Side-by-side
Makefile
View file @ dce97694
NAME_BASEIMAGE = typo3gmbh/baseimage NAME_BASEIMAGE = typo3gmbh/baseimage
MAJOR_BASEIMAGE=1 MAJOR_BASEIMAGE=2
MINOR_BASEIMAGE=0 MINOR_BASEIMAGE=0
PATCHLEVEL_BASEIMAGE=14 PATCHLEVEL_BASEIMAGE=0
FULLVERSION_BASEIMAGE=$(MAJOR_BASEIMAGE).$(MINOR_BASEIMAGE).$(PATCHLEVEL_BASEIMAGE) FULLVERSION_BASEIMAGE=$(MAJOR_BASEIMAGE).$(MINOR_BASEIMAGE).$(PATCHLEVEL_BASEIMAGE)
SHORTVERSION_BASEIMAGE=$(MAJOR_BASEIMAGE).$(MINOR_BASEIMAGE) SHORTVERSION_BASEIMAGE=$(MAJOR_BASEIMAGE).$(MINOR_BASEIMAGE)
NAME_PHP53 = typo3gmbh/php53 NAME_PHP53 = typo3gmbh/php53
MAJOR_PHP53=1 MAJOR_PHP53=2
MINOR_PHP53=0 MINOR_PHP53=0
PATCHLEVEL_PHP53=13 PATCHLEVEL_PHP53=0
FULLVERSION_PHP53=$(MAJOR_PHP53).$(MINOR_PHP53).$(PATCHLEVEL_PHP53) FULLVERSION_PHP53=$(MAJOR_PHP53).$(MINOR_PHP53).$(PATCHLEVEL_PHP53)
SHORTVERSION_PHP53=$(MAJOR_PHP53).$(MINOR_PHP53) SHORTVERSION_PHP53=$(MAJOR_PHP53).$(MINOR_PHP53)
NAME_PHP54 = typo3gmbh/php54 NAME_PHP54 = typo3gmbh/php54
MAJOR_PHP54=1 MAJOR_PHP54=2
MINOR_PHP54=0 MINOR_PHP54=0
PATCHLEVEL_PHP54=13 PATCHLEVEL_PHP54=0
FULLVERSION_PHP54=$(MAJOR_PHP54).$(MINOR_PHP54).$(PATCHLEVEL_PHP54) FULLVERSION_PHP54=$(MAJOR_PHP54).$(MINOR_PHP54).$(PATCHLEVEL_PHP54)
SHORTVERSION_PHP54=$(MAJOR_PHP54).$(MINOR_PHP54) SHORTVERSION_PHP54=$(MAJOR_PHP54).$(MINOR_PHP54)
NAME_PHP55 = typo3gmbh/php55 NAME_PHP55 = typo3gmbh/php55
MAJOR_PHP55=1 MAJOR_PHP55=2
MINOR_PHP55=0 MINOR_PHP55=0
PATCHLEVEL_PHP55=12 PATCHLEVEL_PHP55=0
FULLVERSION_PHP55=$(MAJOR_PHP55).$(MINOR_PHP55).$(PATCHLEVEL_PHP55) FULLVERSION_PHP55=$(MAJOR_PHP55).$(MINOR_PHP55).$(PATCHLEVEL_PHP55)
SHORTVERSION_PHP55=$(MAJOR_PHP55).$(MINOR_PHP55) SHORTVERSION_PHP55=$(MAJOR_PHP55).$(MINOR_PHP55)
NAME_PHP56 = typo3gmbh/php56 NAME_PHP56 = typo3gmbh/php56
MAJOR_PHP56=1 MAJOR_PHP56=2
MINOR_PHP56=0 MINOR_PHP56=0
PATCHLEVEL_PHP56=11 PATCHLEVEL_PHP56=0
FULLVERSION_PHP56=$(MAJOR_PHP56).$(MINOR_PHP56).$(PATCHLEVEL_PHP56) FULLVERSION_PHP56=$(MAJOR_PHP56).$(MINOR_PHP56).$(PATCHLEVEL_PHP56)
SHORTVERSION_PHP56=$(MAJOR_PHP56).$(MINOR_PHP56) SHORTVERSION_PHP56=$(MAJOR_PHP56).$(MINOR_PHP56)
NAME_PHP70 = typo3gmbh/php70 NAME_PHP70 = typo3gmbh/php70
MAJOR_PHP70=1 MAJOR_PHP70=2
MINOR_PHP70=0 MINOR_PHP70=0
PATCHLEVEL_PHP70=16 PATCHLEVEL_PHP70=0
FULLVERSION_PHP70=$(MAJOR_PHP70).$(MINOR_PHP70).$(PATCHLEVEL_PHP70) FULLVERSION_PHP70=$(MAJOR_PHP70).$(MINOR_PHP70).$(PATCHLEVEL_PHP70)
SHORTVERSION_PHP70=$(MAJOR_PHP70).$(MINOR_PHP70) SHORTVERSION_PHP70=$(MAJOR_PHP70).$(MINOR_PHP70)
NAME_PHP71 = typo3gmbh/php71 NAME_PHP71 = typo3gmbh/php71
MAJOR_PHP71=1 MAJOR_PHP71=2
MINOR_PHP71=0 MINOR_PHP71=0
PATCHLEVEL_PHP71=16 PATCHLEVEL_PHP71=0
FULLVERSION_PHP71=$(MAJOR_PHP71).$(MINOR_PHP71).$(PATCHLEVEL_PHP71) FULLVERSION_PHP71=$(MAJOR_PHP71).$(MINOR_PHP71).$(PATCHLEVEL_PHP71)
SHORTVERSION_PHP71=$(MAJOR_PHP71).$(MINOR_PHP71) SHORTVERSION_PHP71=$(MAJOR_PHP71).$(MINOR_PHP71)
NAME_PHP72 = typo3gmbh/php72 NAME_PHP72 = typo3gmbh/php72
MAJOR_PHP72=1 MAJOR_PHP72=2
MINOR_PHP72=0 MINOR_PHP72=0
PATCHLEVEL_PHP72=5 PATCHLEVEL_PHP72=0
FULLVERSION_PHP72=$(MAJOR_PHP72).$(MINOR_PHP72).$(PATCHLEVEL_PHP72) FULLVERSION_PHP72=$(MAJOR_PHP72).$(MINOR_PHP72).$(PATCHLEVEL_PHP72)
SHORTVERSION_PHP72=$(MAJOR_PHP72).$(MINOR_PHP72) SHORTVERSION_PHP72=$(MAJOR_PHP72).$(MINOR_PHP72)
NAME_BAMBOO_PHP53 = typo3gmbh/bamboo-remote-agent-php53 NAME_BAMBOO_PHP53 = typo3gmbh/bamboo-remote-agent-php53
MAJOR_BAMBOO_PHP53=1 MAJOR_BAMBOO_PHP53=2
MINOR_BAMBOO_PHP53=0 MINOR_BAMBOO_PHP53=0
PATCHLEVEL_BAMBOO_PHP53=11 PATCHLEVEL_BAMBOO_PHP53=0
FULLVERSION_BAMBOO_PHP53=$(MAJOR_BAMBOO_PHP53).$(MINOR_BAMBOO_PHP53).$(PATCHLEVEL_BAMBOO_PHP53) FULLVERSION_BAMBOO_PHP53=$(MAJOR_BAMBOO_PHP53).$(MINOR_BAMBOO_PHP53).$(PATCHLEVEL_BAMBOO_PHP53)
SHORTVERSION_BAMBOO_PHP53=$(MAJOR_BAMBOO_PHP53).$(MINOR_BAMBOO_PHP53) SHORTVERSION_BAMBOO_PHP53=$(MAJOR_BAMBOO_PHP53).$(MINOR_BAMBOO_PHP53)
NAME_BAMBOO_PHP54 = typo3gmbh/bamboo-remote-agent-php54 NAME_BAMBOO_PHP54 = typo3gmbh/bamboo-remote-agent-php54
MAJOR_BAMBOO_PHP54=1 MAJOR_BAMBOO_PHP54=2
MINOR_BAMBOO_PHP54=0 MINOR_BAMBOO_PHP54=0
PATCHLEVEL_BAMBOO_PHP54=11 PATCHLEVEL_BAMBOO_PHP54=0
FULLVERSION_BAMBOO_PHP54=$(MAJOR_BAMBOO_PHP54).$(MINOR_BAMBOO_PHP54).$(PATCHLEVEL_BAMBOO_PHP54) FULLVERSION_BAMBOO_PHP54=$(MAJOR_BAMBOO_PHP54).$(MINOR_BAMBOO_PHP54).$(PATCHLEVEL_BAMBOO_PHP54)
SHORTVERSION_BAMBOO_PHP54=$(MAJOR_BAMBOO_PHP54).$(MINOR_BAMBOO_PHP54) SHORTVERSION_BAMBOO_PHP54=$(MAJOR_BAMBOO_PHP54).$(MINOR_BAMBOO_PHP54)
NAME_BAMBOO_PHP55 = typo3gmbh/bamboo-remote-agent-php55 NAME_BAMBOO_PHP55 = typo3gmbh/bamboo-remote-agent-php55
MAJOR_BAMBOO_PHP55=1 MAJOR_BAMBOO_PHP55=2
MINOR_BAMBOO_PHP55=0 MINOR_BAMBOO_PHP55=0
PATCHLEVEL_BAMBOO_PHP55=14 PATCHLEVEL_BAMBOO_PHP55=0
FULLVERSION_BAMBOO_PHP55=$(MAJOR_BAMBOO_PHP55).$(MINOR_BAMBOO_PHP55).$(PATCHLEVEL_BAMBOO_PHP55) FULLVERSION_BAMBOO_PHP55=$(MAJOR_BAMBOO_PHP55).$(MINOR_BAMBOO_PHP55).$(PATCHLEVEL_BAMBOO_PHP55)
SHORTVERSION_BAMBOO_PHP55=$(MAJOR_BAMBOO_PHP55).$(MINOR_BAMBOO_PHP55) SHORTVERSION_BAMBOO_PHP55=$(MAJOR_BAMBOO_PHP55).$(MINOR_BAMBOO_PHP55)
NAME_BAMBOO_PHP56 = typo3gmbh/bamboo-remote-agent-php56 NAME_BAMBOO_PHP56 = typo3gmbh/bamboo-remote-agent-php56
MAJOR_BAMBOO_PHP56=1 MAJOR_BAMBOO_PHP56=2
MINOR_BAMBOO_PHP56=0 MINOR_BAMBOO_PHP56=0
PATCHLEVEL_BAMBOO_PHP56=14 PATCHLEVEL_BAMBOO_PHP56=0
FULLVERSION_BAMBOO_PHP56=$(MAJOR_BAMBOO_PHP56).$(MINOR_BAMBOO_PHP56).$(PATCHLEVEL_BAMBOO_PHP56) FULLVERSION_BAMBOO_PHP56=$(MAJOR_BAMBOO_PHP56).$(MINOR_BAMBOO_PHP56).$(PATCHLEVEL_BAMBOO_PHP56)
SHORTVERSION_BAMBOO_PHP56=$(MAJOR_BAMBOO_PHP56).$(MINOR_BAMBOO_PHP56) SHORTVERSION_BAMBOO_PHP56=$(MAJOR_BAMBOO_PHP56).$(MINOR_BAMBOO_PHP56)
NAME_BAMBOO_PHP70 = typo3gmbh/bamboo-remote-agent-php70 NAME_BAMBOO_PHP70 = typo3gmbh/bamboo-remote-agent-php70
MAJOR_BAMBOO_PHP70=1 MAJOR_BAMBOO_PHP70=2
MINOR_BAMBOO_PHP70=0 MINOR_BAMBOO_PHP70=0
PATCHLEVEL_BAMBOO_PHP70=31 PATCHLEVEL_BAMBOO_PHP70=0
FULLVERSION_BAMBOO_PHP70=$(MAJOR_BAMBOO_PHP70).$(MINOR_BAMBOO_PHP70).$(PATCHLEVEL_BAMBOO_PHP70) FULLVERSION_BAMBOO_PHP70=$(MAJOR_BAMBOO_PHP70).$(MINOR_BAMBOO_PHP70).$(PATCHLEVEL_BAMBOO_PHP70)
SHORTVERSION_BAMBOO_PHP70=$(MAJOR_BAMBOO_PHP70).$(MINOR_BAMBOO_PHP70) SHORTVERSION_BAMBOO_PHP70=$(MAJOR_BAMBOO_PHP70).$(MINOR_BAMBOO_PHP70)
NAME_BAMBOO_PHP71 = typo3gmbh/bamboo-remote-agent-php71 NAME_BAMBOO_PHP71 = typo3gmbh/bamboo-remote-agent-php71
MAJOR_BAMBOO_PHP71=1 MAJOR_BAMBOO_PHP71=2
MINOR_BAMBOO_PHP71=0 MINOR_BAMBOO_PHP71=0
PATCHLEVEL_BAMBOO_PHP71=23 PATCHLEVEL_BAMBOO_PHP71=0
FULLVERSION_BAMBOO_PHP71=$(MAJOR_BAMBOO_PHP71).$(MINOR_BAMBOO_PHP71).$(PATCHLEVEL_BAMBOO_PHP71) FULLVERSION_BAMBOO_PHP71=$(MAJOR_BAMBOO_PHP71).$(MINOR_BAMBOO_PHP71).$(PATCHLEVEL_BAMBOO_PHP71)
SHORTVERSION_BAMBOO_PHP71=$(MAJOR_BAMBOO_PHP71).$(MINOR_BAMBOO_PHP71) SHORTVERSION_BAMBOO_PHP71=$(MAJOR_BAMBOO_PHP71).$(MINOR_BAMBOO_PHP71)
NAME_BAMBOO_PHP72 = typo3gmbh/bamboo-remote-agent-php72 NAME_BAMBOO_PHP72 = typo3gmbh/bamboo-remote-agent-php72
MAJOR_BAMBOO_PHP72=1 MAJOR_BAMBOO_PHP72=2
MINOR_BAMBOO_PHP72=0 MINOR_BAMBOO_PHP72=0
PATCHLEVEL_BAMBOO_PHP72=5 PATCHLEVEL_BAMBOO_PHP72=0
FULLVERSION_BAMBOO_PHP72=$(MAJOR_BAMBOO_PHP72).$(MINOR_BAMBOO_PHP72).$(PATCHLEVEL_BAMBOO_PHP72) FULLVERSION_BAMBOO_PHP72=$(MAJOR_BAMBOO_PHP72).$(MINOR_BAMBOO_PHP72).$(PATCHLEVEL_BAMBOO_PHP72)
SHORTVERSION_BAMBOO_PHP72=$(MAJOR_BAMBOO_PHP72).$(MINOR_BAMBOO_PHP72) SHORTVERSION_BAMBOO_PHP72=$(MAJOR_BAMBOO_PHP72).$(MINOR_BAMBOO_PHP72)
......
bamboo-remote-agent-php53/Dockerfile
View file @ dce97694
FROM typo3gmbh/php53:1.0 FROM typo3gmbh/php53:2.0
MAINTAINER TYPO3 GmbH <info@typo3.com> MAINTAINER TYPO3 GmbH <info@typo3.com>
ADD . /pd_build ADD . /pd_build
......
bamboo-remote-agent-php53/finalize.sh
View file @ dce97694
...@@ -5,11 +5,9 @@ set -x ...@@ -5,11 +5,9 @@ set -x
apt-get clean apt-get clean
rm -rf \ rm -rf \
/var/lib/apt/lists/* \
/tmp/* \ /tmp/* \
/var/tmp/* \ /var/tmp/* \
/usr/local/src/* \ /usr/local/src/* \
/usr/include/php/20151012/ext/apcu/ \
# #
rm -rf /pd_build rm -rf /pd_build
bamboo-remote-agent-php54/Dockerfile
View file @ dce97694
FROM typo3gmbh/php54:1.0 FROM typo3gmbh/php54:2.0
MAINTAINER TYPO3 GmbH <info@typo3.com> MAINTAINER TYPO3 GmbH <info@typo3.com>
ADD . /pd_build ADD . /pd_build
......
bamboo-remote-agent-php54/finalize.sh
View file @ dce97694
...@@ -5,11 +5,9 @@ set -x ...@@ -5,11 +5,9 @@ set -x
apt-get clean apt-get clean
rm -rf \ rm -rf \
/var/lib/apt/lists/* \
/tmp/* \ /tmp/* \
/var/tmp/* \ /var/tmp/* \
/usr/local/src/* \ /usr/local/src/* \
/usr/include/php/20151012/ext/apcu/ \
# #
rm -rf /pd_build rm -rf /pd_build
bamboo-remote-agent-php55/Dockerfile
View file @ dce97694
FROM typo3gmbh/php55:1.0 FROM typo3gmbh/php55:2.0
MAINTAINER TYPO3 GmbH <info@typo3.com> MAINTAINER TYPO3 GmbH <info@typo3.com>
ADD . /pd_build ADD . /pd_build
......
bamboo-remote-agent-php55/finalize.sh
View file @ dce97694
...@@ -5,11 +5,9 @@ set -x ...@@ -5,11 +5,9 @@ set -x
apt-get clean apt-get clean
rm -rf \ rm -rf \
/var/lib/apt/lists/* \
/tmp/* \ /tmp/* \
/var/tmp/* \ /var/tmp/* \
/usr/local/src/* \ /usr/local/src/* \
/usr/include/php/20151012/ext/apcu/ \
# #
rm -rf /pd_build rm -rf /pd_build
bamboo-remote-agent-php56/Dockerfile
View file @ dce97694
FROM typo3gmbh/php56:1.0 FROM typo3gmbh/php56:2.0
MAINTAINER TYPO3 GmbH <info@typo3.com> MAINTAINER TYPO3 GmbH <info@typo3.com>
ADD . /pd_build ADD . /pd_build
......
bamboo-remote-agent-php56/finalize.sh
View file @ dce97694
...@@ -5,11 +5,9 @@ set -x ...@@ -5,11 +5,9 @@ set -x
apt-get clean apt-get clean
rm -rf \ rm -rf \
/var/lib/apt/lists/* \
/tmp/* \ /tmp/* \
/var/tmp/* \ /var/tmp/* \
/usr/local/src/* \ /usr/local/src/* \
/usr/include/php/20151012/ext/apcu/ \
# #
rm -rf /pd_build rm -rf /pd_build
bamboo-remote-agent-php70/Dockerfile
View file @ dce97694
FROM typo3gmbh/php70:1.0 FROM typo3gmbh/php70:2.0
MAINTAINER TYPO3 GmbH <info@typo3.com> MAINTAINER TYPO3 GmbH <info@typo3.com>
ADD . /pd_build ADD . /pd_build
......
bamboo-remote-agent-php70/finalize.sh
View file @ dce97694
...@@ -5,11 +5,9 @@ set -x ...@@ -5,11 +5,9 @@ set -x
apt-get clean apt-get clean
rm -rf \ rm -rf \
/var/lib/apt/lists/* \
/tmp/* \ /tmp/* \
/var/tmp/* \ /var/tmp/* \
/usr/local/src/* \ /usr/local/src/* \
/usr/include/php/20151012/ext/apcu/ \
# #
rm -rf /pd_build rm -rf /pd_build
bamboo-remote-agent-php71/Dockerfile
View file @ dce97694
FROM typo3gmbh/php71:1.0 FROM typo3gmbh/php71:2.0
MAINTAINER TYPO3 GmbH <info@typo3.com> MAINTAINER TYPO3 GmbH <info@typo3.com>
ADD . /pd_build ADD . /pd_build
......
bamboo-remote-agent-php71/finalize.sh
View file @ dce97694
...@@ -5,11 +5,9 @@ set -x ...@@ -5,11 +5,9 @@ set -x
apt-get clean apt-get clean
rm -rf \ rm -rf \
/var/lib/apt/lists/* \
/tmp/* \ /tmp/* \
/var/tmp/* \ /var/tmp/* \
/usr/local/src/* \ /usr/local/src/* \
/usr/include/php/20151012/ext/apcu/ \
# #
rm -rf /pd_build rm -rf /pd_build
bamboo-remote-agent-php72/Dockerfile
View file @ dce97694
FROM typo3gmbh/php72:1.0 FROM typo3gmbh/php72:2.0
MAINTAINER TYPO3 GmbH <info@typo3.com> MAINTAINER TYPO3 GmbH <info@typo3.com>
ADD . /pd_build ADD . /pd_build
......
bamboo-remote-agent-php72/finalize.sh
View file @ dce97694
...@@ -5,11 +5,9 @@ set -x ...@@ -5,11 +5,9 @@ set -x
apt-get clean apt-get clean
rm -rf \ rm -rf \
/var/lib/apt/lists/* \
/tmp/* \ /tmp/* \
/var/tmp/* \ /var/tmp/* \
/usr/local/src/* \ /usr/local/src/* \
/usr/include/php/20151012/ext/apcu/ \
# #
rm -rf /pd_build rm -rf /pd_build
baseimage/Dockerfile
View file @ dce97694
FROM ubuntu:16.04 FROM ubuntu:18.04
MAINTAINER TYPO3 GmbH <info@typo3.com> MAINTAINER TYPO3 GmbH <info@typo3.com>
ADD . /bd_build ADD . /bd_build
......
baseimage/cleanup.sh
View file @ dce97694
...@@ -4,9 +4,7 @@ source /bd_build/buildconfig ...@@ -4,9 +4,7 @@ source /bd_build/buildconfig
set -x set -x
apt-get clean apt-get clean
apt-get -y autoremove
rm -rf /bd_build rm -rf /bd_build
rm -rf /tmp/* /var/tmp/* rm -rf /tmp/* /var/tmp/*
rm -rf /var/lib/apt/lists/*
rm -f /var/cache/apt/archives/*.deb
rm -f /var/cache/apt/*cache.bin
rm -f /etc/dpkg/dpkg.cfg.d/docker-apt-speedup rm -f /etc/dpkg/dpkg.cfg.d/docker-apt-speedup
baseimage/services/syslog-ng/syslog-ng.conf
View file @ dce97694
@version: 3.5 @version: 3.13
@include "scl.conf" @include "scl.conf"
@include "`scl-root`/system/tty10.conf" @include "`scl-root`/system/tty10.conf"
...@@ -54,7 +54,7 @@ destination d_newscrit { file("/var/log/news/news.crit"); }; ...@@ -54,7 +54,7 @@ destination d_newscrit { file("/var/log/news/news.crit"); };
destination d_newserr { file("/var/log/news/news.err"); }; destination d_newserr { file("/var/log/news/news.err"); };
destination d_newsnotice { file("/var/log/news/news.notice"); }; destination d_newsnotice { file("/var/log/news/news.notice"); };
# Some `catch-all' logfiles. # Some 'catch-all' logfiles.
# #
destination d_debug { file("/var/log/debug"); }; destination d_debug { file("/var/log/debug"); };
destination d_error { file("/var/log/error"); }; destination d_error { file("/var/log/error"); };
......
baseimage/utilities.sh
View file @ dce97694
...@@ -4,7 +4,7 @@ source /bd_build/buildconfig ...@@ -4,7 +4,7 @@ source /bd_build/buildconfig
set -x set -x
## Often used tools. ## Often used tools.
$minimal_apt_get_install curl less vim psmisc $minimal_apt_get_install curl less vim psmisc net-tools
## This tool runs a command as another user and sets $HOME. ## This tool runs a command as another user and sets $HOME.
cp /bd_build/bin/setuser /sbin/setuser cp /bd_build/bin/setuser /sbin/setuser
php53/Dockerfile
View file @ dce97694
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
......
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