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

Merge branch 'release/2.0.0'

parents 3af5b116 a8fe3445
NAME_BASEIMAGE = typo3gmbh/baseimage
MAJOR_BASEIMAGE=1
MAJOR_BASEIMAGE=2
MINOR_BASEIMAGE=0
PATCHLEVEL_BASEIMAGE=14
PATCHLEVEL_BASEIMAGE=2
FULLVERSION_BASEIMAGE=$(MAJOR_BASEIMAGE).$(MINOR_BASEIMAGE).$(PATCHLEVEL_BASEIMAGE)
SHORTVERSION_BASEIMAGE=$(MAJOR_BASEIMAGE).$(MINOR_BASEIMAGE)
NAME_PHP53 = typo3gmbh/php53
MAJOR_PHP53=1
MAJOR_PHP53=2
MINOR_PHP53=0
PATCHLEVEL_PHP53=13
PATCHLEVEL_PHP53=2
FULLVERSION_PHP53=$(MAJOR_PHP53).$(MINOR_PHP53).$(PATCHLEVEL_PHP53)
SHORTVERSION_PHP53=$(MAJOR_PHP53).$(MINOR_PHP53)
NAME_PHP54 = typo3gmbh/php54
MAJOR_PHP54=1
MAJOR_PHP54=2
MINOR_PHP54=0
PATCHLEVEL_PHP54=13
PATCHLEVEL_PHP54=2
FULLVERSION_PHP54=$(MAJOR_PHP54).$(MINOR_PHP54).$(PATCHLEVEL_PHP54)
SHORTVERSION_PHP54=$(MAJOR_PHP54).$(MINOR_PHP54)
NAME_PHP55 = typo3gmbh/php55
MAJOR_PHP55=1
MAJOR_PHP55=2
MINOR_PHP55=0
PATCHLEVEL_PHP55=12
PATCHLEVEL_PHP55=2
FULLVERSION_PHP55=$(MAJOR_PHP55).$(MINOR_PHP55).$(PATCHLEVEL_PHP55)
SHORTVERSION_PHP55=$(MAJOR_PHP55).$(MINOR_PHP55)
NAME_PHP56 = typo3gmbh/php56
MAJOR_PHP56=1
MAJOR_PHP56=2
MINOR_PHP56=0
PATCHLEVEL_PHP56=11
PATCHLEVEL_PHP56=2
FULLVERSION_PHP56=$(MAJOR_PHP56).$(MINOR_PHP56).$(PATCHLEVEL_PHP56)
SHORTVERSION_PHP56=$(MAJOR_PHP56).$(MINOR_PHP56)
NAME_PHP70 = typo3gmbh/php70
MAJOR_PHP70=1
MAJOR_PHP70=2
MINOR_PHP70=0
PATCHLEVEL_PHP70=16
PATCHLEVEL_PHP70=2
FULLVERSION_PHP70=$(MAJOR_PHP70).$(MINOR_PHP70).$(PATCHLEVEL_PHP70)
SHORTVERSION_PHP70=$(MAJOR_PHP70).$(MINOR_PHP70)
NAME_PHP71 = typo3gmbh/php71
MAJOR_PHP71=1
MAJOR_PHP71=2
MINOR_PHP71=0
PATCHLEVEL_PHP71=16
PATCHLEVEL_PHP71=2
FULLVERSION_PHP71=$(MAJOR_PHP71).$(MINOR_PHP71).$(PATCHLEVEL_PHP71)
SHORTVERSION_PHP71=$(MAJOR_PHP71).$(MINOR_PHP71)
NAME_PHP72 = typo3gmbh/php72
MAJOR_PHP72=1
MAJOR_PHP72=2
MINOR_PHP72=0
PATCHLEVEL_PHP72=5
PATCHLEVEL_PHP72=2
FULLVERSION_PHP72=$(MAJOR_PHP72).$(MINOR_PHP72).$(PATCHLEVEL_PHP72)
SHORTVERSION_PHP72=$(MAJOR_PHP72).$(MINOR_PHP72)
NAME_BAMBOO_PHP53 = typo3gmbh/bamboo-remote-agent-php53
MAJOR_BAMBOO_PHP53=1
MAJOR_BAMBOO_PHP53=2
MINOR_BAMBOO_PHP53=0
PATCHLEVEL_BAMBOO_PHP53=11
PATCHLEVEL_BAMBOO_PHP53=2
FULLVERSION_BAMBOO_PHP53=$(MAJOR_BAMBOO_PHP53).$(MINOR_BAMBOO_PHP53).$(PATCHLEVEL_BAMBOO_PHP53)
SHORTVERSION_BAMBOO_PHP53=$(MAJOR_BAMBOO_PHP53).$(MINOR_BAMBOO_PHP53)
NAME_BAMBOO_PHP54 = typo3gmbh/bamboo-remote-agent-php54
MAJOR_BAMBOO_PHP54=1
MAJOR_BAMBOO_PHP54=2
MINOR_BAMBOO_PHP54=0
PATCHLEVEL_BAMBOO_PHP54=11
PATCHLEVEL_BAMBOO_PHP54=2
FULLVERSION_BAMBOO_PHP54=$(MAJOR_BAMBOO_PHP54).$(MINOR_BAMBOO_PHP54).$(PATCHLEVEL_BAMBOO_PHP54)
SHORTVERSION_BAMBOO_PHP54=$(MAJOR_BAMBOO_PHP54).$(MINOR_BAMBOO_PHP54)
NAME_BAMBOO_PHP55 = typo3gmbh/bamboo-remote-agent-php55
MAJOR_BAMBOO_PHP55=1
MAJOR_BAMBOO_PHP55=2
MINOR_BAMBOO_PHP55=0
PATCHLEVEL_BAMBOO_PHP55=14
PATCHLEVEL_BAMBOO_PHP55=2
FULLVERSION_BAMBOO_PHP55=$(MAJOR_BAMBOO_PHP55).$(MINOR_BAMBOO_PHP55).$(PATCHLEVEL_BAMBOO_PHP55)
SHORTVERSION_BAMBOO_PHP55=$(MAJOR_BAMBOO_PHP55).$(MINOR_BAMBOO_PHP55)
NAME_BAMBOO_PHP56 = typo3gmbh/bamboo-remote-agent-php56
MAJOR_BAMBOO_PHP56=1
MAJOR_BAMBOO_PHP56=2
MINOR_BAMBOO_PHP56=0
PATCHLEVEL_BAMBOO_PHP56=14
PATCHLEVEL_BAMBOO_PHP56=2
FULLVERSION_BAMBOO_PHP56=$(MAJOR_BAMBOO_PHP56).$(MINOR_BAMBOO_PHP56).$(PATCHLEVEL_BAMBOO_PHP56)
SHORTVERSION_BAMBOO_PHP56=$(MAJOR_BAMBOO_PHP56).$(MINOR_BAMBOO_PHP56)
NAME_BAMBOO_PHP70 = typo3gmbh/bamboo-remote-agent-php70
MAJOR_BAMBOO_PHP70=1
MAJOR_BAMBOO_PHP70=2
MINOR_BAMBOO_PHP70=0
PATCHLEVEL_BAMBOO_PHP70=31
PATCHLEVEL_BAMBOO_PHP70=2
FULLVERSION_BAMBOO_PHP70=$(MAJOR_BAMBOO_PHP70).$(MINOR_BAMBOO_PHP70).$(PATCHLEVEL_BAMBOO_PHP70)
SHORTVERSION_BAMBOO_PHP70=$(MAJOR_BAMBOO_PHP70).$(MINOR_BAMBOO_PHP70)
NAME_BAMBOO_PHP71 = typo3gmbh/bamboo-remote-agent-php71
MAJOR_BAMBOO_PHP71=1
MAJOR_BAMBOO_PHP71=2
MINOR_BAMBOO_PHP71=0
PATCHLEVEL_BAMBOO_PHP71=23
PATCHLEVEL_BAMBOO_PHP71=2
FULLVERSION_BAMBOO_PHP71=$(MAJOR_BAMBOO_PHP71).$(MINOR_BAMBOO_PHP71).$(PATCHLEVEL_BAMBOO_PHP71)
SHORTVERSION_BAMBOO_PHP71=$(MAJOR_BAMBOO_PHP71).$(MINOR_BAMBOO_PHP71)
NAME_BAMBOO_PHP72 = typo3gmbh/bamboo-remote-agent-php72
MAJOR_BAMBOO_PHP72=1
MAJOR_BAMBOO_PHP72=2
MINOR_BAMBOO_PHP72=0
PATCHLEVEL_BAMBOO_PHP72=5
PATCHLEVEL_BAMBOO_PHP72=2
FULLVERSION_BAMBOO_PHP72=$(MAJOR_BAMBOO_PHP72).$(MINOR_BAMBOO_PHP72).$(PATCHLEVEL_BAMBOO_PHP72)
SHORTVERSION_BAMBOO_PHP72=$(MAJOR_BAMBOO_PHP72).$(MINOR_BAMBOO_PHP72)
......
......@@ -24,7 +24,7 @@ own stuff on-top of that. This feature is used here.
This is the lowest layer of images put on top of each other.
typo3gmbh/baseimage is a Docker image based off of Phusion's baseimage-docker, but has been
modified to run on Ubuntu 16.04 and removes features deemed unnecessary for a modern baseimage.
modified to run on Ubuntu 18.04 and removes features deemed unnecessary for a modern baseimage.
baseimage is a special [Docker](https://www.docker.com) image that is configured for
correct use within Docker containers. It is Ubuntu, plus:
......@@ -52,10 +52,10 @@ to the core testing infrastructure.
Simple usage example, executing accepance tests on a fresh core clone:
```
# fetch latest 1.0 version of php72 image
docker pull typo3gmbh/php72:1.0
# fetch latest version of php72 image
docker pull typo3gmbh/php72:latest
# start a local image, start processes and get a bash on it, delete everything on container logout
docker run -it --rm typo3gmbh/php72:1.0 /sbin/my_init -- bash
docker run -it --rm typo3gmbh/php72:latest /sbin/my_init -- bash
mkdir /srv/tmp && cd /srv/tmp
git clone git://git.typo3.org/Packages/TYPO3.CMS.git .
mkdir -p typo3temp/var/tests/
......
FROM typo3gmbh/php53:1.0
FROM typo3gmbh/php53:2.0
MAINTAINER TYPO3 GmbH <info@typo3.com>
ADD . /pd_build
......
......@@ -5,11 +5,10 @@ set -x
apt-get clean
rm -rf \
/var/lib/apt/lists/* \
/var/lib/apt/lists/* \
/tmp/* \
/var/tmp/* \
/usr/local/src/* \
/usr/include/php/20151012/ext/apcu/ \
#
rm -rf /pd_build
FROM typo3gmbh/php54:1.0
FROM typo3gmbh/php54:2.0
MAINTAINER TYPO3 GmbH <info@typo3.com>
ADD . /pd_build
......
......@@ -5,11 +5,10 @@ set -x
apt-get clean
rm -rf \
/var/lib/apt/lists/* \
/var/lib/apt/lists/* \
/tmp/* \
/var/tmp/* \
/usr/local/src/* \
/usr/include/php/20151012/ext/apcu/ \
#
rm -rf /pd_build
FROM typo3gmbh/php55:1.0
FROM typo3gmbh/php55:2.0
MAINTAINER TYPO3 GmbH <info@typo3.com>
ADD . /pd_build
......
......@@ -5,11 +5,10 @@ set -x
apt-get clean
rm -rf \
/var/lib/apt/lists/* \
/var/lib/apt/lists/* \
/tmp/* \
/var/tmp/* \
/usr/local/src/* \
/usr/include/php/20151012/ext/apcu/ \
#
rm -rf /pd_build
FROM typo3gmbh/php56:1.0
FROM typo3gmbh/php56:2.0
MAINTAINER TYPO3 GmbH <info@typo3.com>
ADD . /pd_build
......
......@@ -5,11 +5,10 @@ set -x
apt-get clean
rm -rf \
/var/lib/apt/lists/* \
/var/lib/apt/lists/* \
/tmp/* \
/var/tmp/* \
/usr/local/src/* \
/usr/include/php/20151012/ext/apcu/ \
#
rm -rf /pd_build
FROM typo3gmbh/php70:1.0
FROM typo3gmbh/php70:2.0
MAINTAINER TYPO3 GmbH <info@typo3.com>
ADD . /pd_build
......
......@@ -5,11 +5,10 @@ set -x
apt-get clean
rm -rf \
/var/lib/apt/lists/* \
/var/lib/apt/lists/* \
/tmp/* \
/var/tmp/* \
/usr/local/src/* \
/usr/include/php/20151012/ext/apcu/ \
#
rm -rf /pd_build
FROM typo3gmbh/php71:1.0
FROM typo3gmbh/php71:2.0
MAINTAINER TYPO3 GmbH <info@typo3.com>
ADD . /pd_build
......
......@@ -5,11 +5,10 @@ set -x
apt-get clean
rm -rf \
/var/lib/apt/lists/* \
/var/lib/apt/lists/* \
/tmp/* \
/var/tmp/* \
/usr/local/src/* \
/usr/include/php/20151012/ext/apcu/ \
#
rm -rf /pd_build
FROM typo3gmbh/php72:1.0
FROM typo3gmbh/php72:2.0
MAINTAINER TYPO3 GmbH <info@typo3.com>
ADD . /pd_build
......
......@@ -5,11 +5,10 @@ set -x
apt-get clean
rm -rf \
/var/lib/apt/lists/* \
/var/lib/apt/lists/* \
/tmp/* \
/var/tmp/* \
/usr/local/src/* \
/usr/include/php/20151012/ext/apcu/ \
#
rm -rf /pd_build
FROM ubuntu:16.04
FROM ubuntu:18.04
MAINTAINER TYPO3 GmbH <info@typo3.com>
ADD . /bd_build
......
......@@ -4,9 +4,8 @@ source /bd_build/buildconfig
set -x
apt-get clean
apt-get -y autoremove
rm -rf /var/lib/apt/lists/*
rm -rf /bd_build
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
@version: 3.5
@version: 3.13
@include "scl.conf"
@include "`scl-root`/system/tty10.conf"
......@@ -54,7 +54,7 @@ destination d_newscrit { file("/var/log/news/news.crit"); };
destination d_newserr { file("/var/log/news/news.err"); };
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_error { file("/var/log/error"); };
......
......@@ -4,7 +4,7 @@ source /bd_build/buildconfig
set -x
## 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.
cp /bd_build/bin/setuser /sbin/setuser
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