Merge branch 'release/3.0.0'

43c9bb95 · Christian Kuhn · 1837976d · 0d7c811b · 43c9bb95 · 43c9bb95
Commit 43c9bb95 authored Jul 18, 2018 by Christian Kuhn
--- a/.gitignore
+++ b/.gitignore
@@ -9,11 +9,5 @@ build_php56
 build_php70
 build_php71
 build_php72
-build_bamboo-php53
-build_bamboo-php54
-build_bamboo-php55
-build_bamboo-php56
-build_bamboo-php70
-build_bamboo-php71
-build_bamboo-php72
+build_bamboo
 .idea
\ No newline at end of file
--- a/Makefile
+++ b/Makefile
 NAME_BASEIMAGE = typo3gmbh/baseimage
-MAJOR_BASEIMAGE=2
+MAJOR_BASEIMAGE=3
 MINOR_BASEIMAGE=0
-PATCHLEVEL_BASEIMAGE=4
+PATCHLEVEL_BASEIMAGE=3
 FULLVERSION_BASEIMAGE=$(MAJOR_BASEIMAGE).$(MINOR_BASEIMAGE).$(PATCHLEVEL_BASEIMAGE)
 SHORTVERSION_BASEIMAGE=$(MAJOR_BASEIMAGE).$(MINOR_BASEIMAGE)


 NAME_PHP53 = typo3gmbh/php53
-MAJOR_PHP53=2
+MAJOR_PHP53=3
 MINOR_PHP53=0
-PATCHLEVEL_PHP53=4
+PATCHLEVEL_PHP53=3
 FULLVERSION_PHP53=$(MAJOR_PHP53).$(MINOR_PHP53).$(PATCHLEVEL_PHP53)
 SHORTVERSION_PHP53=$(MAJOR_PHP53).$(MINOR_PHP53)

 NAME_PHP54 = typo3gmbh/php54
-MAJOR_PHP54=2
+MAJOR_PHP54=3
 MINOR_PHP54=0
-PATCHLEVEL_PHP54=4
+PATCHLEVEL_PHP54=3
 FULLVERSION_PHP54=$(MAJOR_PHP54).$(MINOR_PHP54).$(PATCHLEVEL_PHP54)
 SHORTVERSION_PHP54=$(MAJOR_PHP54).$(MINOR_PHP54)

 NAME_PHP55 = typo3gmbh/php55
-MAJOR_PHP55=2
+MAJOR_PHP55=3
 MINOR_PHP55=0
-PATCHLEVEL_PHP55=4
+PATCHLEVEL_PHP55=3
 FULLVERSION_PHP55=$(MAJOR_PHP55).$(MINOR_PHP55).$(PATCHLEVEL_PHP55)
 SHORTVERSION_PHP55=$(MAJOR_PHP55).$(MINOR_PHP55)

 NAME_PHP56 = typo3gmbh/php56
-MAJOR_PHP56=2
+MAJOR_PHP56=3
 MINOR_PHP56=0
-PATCHLEVEL_PHP56=4
+PATCHLEVEL_PHP56=3
 FULLVERSION_PHP56=$(MAJOR_PHP56).$(MINOR_PHP56).$(PATCHLEVEL_PHP56)
 SHORTVERSION_PHP56=$(MAJOR_PHP56).$(MINOR_PHP56)

 NAME_PHP70 = typo3gmbh/php70
-MAJOR_PHP70=2
+MAJOR_PHP70=3
 MINOR_PHP70=0
-PATCHLEVEL_PHP70=4
+PATCHLEVEL_PHP70=3
 FULLVERSION_PHP70=$(MAJOR_PHP70).$(MINOR_PHP70).$(PATCHLEVEL_PHP70)
 SHORTVERSION_PHP70=$(MAJOR_PHP70).$(MINOR_PHP70)

 NAME_PHP71 = typo3gmbh/php71
-MAJOR_PHP71=2
+MAJOR_PHP71=3
 MINOR_PHP71=0
-PATCHLEVEL_PHP71=4
+PATCHLEVEL_PHP71=3
 FULLVERSION_PHP71=$(MAJOR_PHP71).$(MINOR_PHP71).$(PATCHLEVEL_PHP71)
 SHORTVERSION_PHP71=$(MAJOR_PHP71).$(MINOR_PHP71)

 NAME_PHP72 = typo3gmbh/php72
-MAJOR_PHP72=2
+MAJOR_PHP72=3
 MINOR_PHP72=0
-PATCHLEVEL_PHP72=4
+PATCHLEVEL_PHP72=3
 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=2
-MINOR_BAMBOO_PHP53=0
-PATCHLEVEL_BAMBOO_PHP53=4
-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=2
-MINOR_BAMBOO_PHP54=0
-PATCHLEVEL_BAMBOO_PHP54=4
-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=2
-MINOR_BAMBOO_PHP55=0
-PATCHLEVEL_BAMBOO_PHP55=4
-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=2
-MINOR_BAMBOO_PHP56=0
-PATCHLEVEL_BAMBOO_PHP56=4
-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=2
-MINOR_BAMBOO_PHP70=0
-PATCHLEVEL_BAMBOO_PHP70=4
-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=2
-MINOR_BAMBOO_PHP71=0
-PATCHLEVEL_BAMBOO_PHP71=4
-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=2
-MINOR_BAMBOO_PHP72=0
-PATCHLEVEL_BAMBOO_PHP72=4
-FULLVERSION_BAMBOO_PHP72=$(MAJOR_BAMBOO_PHP72).$(MINOR_BAMBOO_PHP72).$(PATCHLEVEL_BAMBOO_PHP72)
-SHORTVERSION_BAMBOO_PHP72=$(MAJOR_BAMBOO_PHP72).$(MINOR_BAMBOO_PHP72)
+NAME_BAMBOO = typo3gmbh/bamboo-remote-agent
+MAJOR_BAMBOO=1
+MINOR_BAMBOO=0
+PATCHLEVEL_BAMBOO=3
+FULLVERSION_BAMBOO=$(MAJOR_BAMBOO).$(MINOR_BAMBOO).$(PATCHLEVEL_BAMBOO)
+SHORTVERSION_BAMBOO=$(MAJOR_BAMBOO).$(MINOR_BAMBOO)



@@ -118,13 +76,7 @@ SHORTVERSION_BAMBOO_PHP72=$(MAJOR_BAMBOO_PHP72).$(MINOR_BAMBOO_PHP72)
 	build_php70 \
 	build_php71 \
 	build_php72 \
-	build_bamboo_php53 \
-	build_bamboo_php54 \
-	build_bamboo_php55 \
-	build_bamboo_php56 \
-	build_bamboo_php70 \
-	build_bamboo_php71 \
-	build_bamboo_php72 \
+	build_bamboo \
 	release \
 	release_baseimage \
 	release_php53 \
@@ -134,13 +86,7 @@ SHORTVERSION_BAMBOO_PHP72=$(MAJOR_BAMBOO_PHP72).$(MINOR_BAMBOO_PHP72)
 	release_php70 \
 	release_php71 \
 	release_php72 \
-	release_bamboo_php53 \
-	release_bamboo_php54 \
-	release_bamboo_php55 \
-	release_bamboo_php56 \
-	release_bamboo_php70 \
-	release_bamboo_php71 \
-	release_bamboo_php72 \
+	release_bamboo \
 	clean \
 	clean_baseimage \
 	clean_php53 \
@@ -150,13 +96,7 @@ SHORTVERSION_BAMBOO_PHP72=$(MAJOR_BAMBOO_PHP72).$(MINOR_BAMBOO_PHP72)
 	clean_php70 \
 	clean_php71 \
 	clean_php72 \
-	clean_bamboo_php53 \
-	clean_bamboo_php54 \
-	clean_bamboo_php55 \
-	clean_bamboo_php56 \
-	clean_bamboo_php70 \
-	clean_bamboo_php71 \
-	clean_bamboo_php72 \
+	clean_bamboo \
 	clean_images \
 	clean_images_baseimage \
 	clean_images_php53 \
@@ -166,13 +106,7 @@ SHORTVERSION_BAMBOO_PHP72=$(MAJOR_BAMBOO_PHP72).$(MINOR_BAMBOO_PHP72)
 	clean_images_php70 \
 	clean_images_php71 \
 	clean_images_php72 \
-	clean_images_bamboo_php53 \
-	clean_images_bamboo_php54 \
-	clean_images_bamboo_php55 \
-	clean_images_bamboo_php56 \
-	clean_images_bamboo_php70 \
-	clean_images_bamboo_php71 \
-	clean_images_bamboo_php72
+	clean_images_bamboo



@@ -193,15 +127,6 @@ build_php: \
 	build_php71 \
 	build_php72

-build_bamboo: \
-	build_bamboo_php53 \
-	build_bamboo_php54 \
-	build_bamboo_php55 \
-	build_bamboo_php56 \
-	build_bamboo_php70 \
-	build_bamboo_php71 \
-	build_bamboo_php72
-
 release: \
 	release_baseimage \
 	release_php \
@@ -216,15 +141,6 @@ release_php: \
 	release_php71 \
 	release_php72

-release_bamboo: \
-	release_bamboo_php53 \
-	release_bamboo_php54 \
-	release_bamboo_php55 \
-	release_bamboo_php56 \
-	release_bamboo_php70 \
-	release_bamboo_php71 \
-	release_bamboo_php72
-
 clean: \
 	clean_baseimage \
 	clean_php53 \
@@ -234,13 +150,7 @@ clean: \
 	clean_php70 \
 	clean_php71 \
 	clean_php72 \
-	clean_bamboo_php53 \
-	clean_bamboo_php54 \
-	clean_bamboo_php55 \
-	clean_bamboo_php56 \
-	clean_bamboo_php70 \
-	clean_bamboo_php71 \
-	clean_bamboo_php72
+	clean_bamboo


 clean_images: \
@@ -252,13 +162,7 @@ clean_images: \
 	clean_images_php70 \
 	clean_images_php71 \
 	clean_images_php72 \
-	clean_images_bamboo_php53 \
-	clean_images_bamboo_php54 \
-	clean_images_bamboo_php55 \
-	clean_images_bamboo_php56 \
-	clean_images_bamboo_php70 \
-	clean_images_bamboo_php71 \
-	clean_images_bamboo_php72
+	clean_images_bamboo


 build_baseimage:
@@ -455,176 +359,25 @@ clean_images_php72:



-build_bamboo_php53: build_php53
-	rm -rf build_bamboo-php53
-	cp -pR bamboo-remote-agent-php53 build_bamboo-php53
-	echo system.imageVersion=$(FULLVERSION_BAMBOO_PHP53) >> build_bamboo-php53/config/bamboo/bamboo-capabilities.properties
-	docker build -t $(NAME_BAMBOO_PHP53):$(FULLVERSION_BAMBOO_PHP53) build_bamboo-php53
+build_bamboo: build_baseimage
+	rm -rf build_bamboo
+	cp -pR bamboo-remote-agent build_bamboo
+	docker build -t $(NAME_BAMBOO):$(FULLVERSION_BAMBOO) build_bamboo

-release_bamboo_php53:
-	@if ! docker images $(NAME_BAMBOO_PHP53) | awk '{ print $$2 }' | grep -q -F $(FULLVERSION_BAMBOO_PHP53); then \
-		echo "$(NAME_BAMBOO_PHP53) version $(FULLVERSION_BAMBOO_PHP53) is not yet built. Please run 'make build'"; false; \
-	fi
-	docker tag $(NAME_BAMBOO_PHP53):$(FULLVERSION_BAMBOO_PHP53) $(NAME_BAMBOO_PHP53):$(SHORTVERSION_BAMBOO_PHP53)
-	docker tag $(NAME_BAMBOO_PHP53):$(FULLVERSION_BAMBOO_PHP53) $(NAME_BAMBOO_PHP53):latest
-	docker push $(NAME_BAMBOO_PHP53):latest
-	docker push $(NAME_BAMBOO_PHP53):$(FULLVERSION_BAMBOO_PHP53)
-	docker push $(NAME_BAMBOO_PHP53):$(SHORTVERSION_BAMBOO_PHP53)
-
-clean_bamboo_php53:
-	rm -rf build_bamboo-php53
-
-clean_images_bamboo_php53:
-	docker rmi $(NAME_BAMBOO_PHP53):latest || true
-	docker rmi $(NAME_BAMBOO_PHP53):$(SHORTVERSION_BAMBOO_PHP53) || true
-	docker rmi $(NAME_BAMBOO_PHP53):$(FULLVERSION_BAMBOO_PHP53) || true
-
-
-build_bamboo_php54: build_php54
-	rm -rf build_bamboo-php54
-	cp -pR bamboo-remote-agent-php54 build_bamboo-php54
-	echo system.imageVersion=$(FULLVERSION_BAMBOO_PHP54) >> build_bamboo-php54/config/bamboo/bamboo-capabilities.properties
-	docker build -t $(NAME_BAMBOO_PHP54):$(FULLVERSION_BAMBOO_PHP54) build_bamboo-php54
-
-release_bamboo_php54:
-	@if ! docker images $(NAME_BAMBOO_PHP54) | awk '{ print $$2 }' | grep -q -F $(FULLVERSION_BAMBOO_PHP54); then \
-		echo "$(NAME_BAMBOO_PHP54) version $(FULLVERSION_BAMBOO_PHP54) is not yet built. Please run 'make build'"; false; \
-	fi
-	docker tag $(NAME_BAMBOO_PHP54):$(FULLVERSION_BAMBOO_PHP54) $(NAME_BAMBOO_PHP54):$(SHORTVERSION_BAMBOO_PHP54)
-	docker tag $(NAME_BAMBOO_PHP54):$(FULLVERSION_BAMBOO_PHP54) $(NAME_BAMBOO_PHP54):latest
-	docker push $(NAME_BAMBOO_PHP54):latest
-	docker push $(NAME_BAMBOO_PHP54):$(FULLVERSION_BAMBOO_PHP54)
-	docker push $(NAME_BAMBOO_PHP54):$(SHORTVERSION_BAMBOO_PHP54)
-
-clean_bamboo_php54:
-	rm -rf build_bamboo-php54
-
-clean_images_bamboo_php54:
-	docker rmi $(NAME_BAMBOO_PHP54):latest || true
-	docker rmi $(NAME_BAMBOO_PHP54):$(SHORTVERSION_BAMBOO_PHP54) || true
-	docker rmi $(NAME_BAMBOO_PHP54):$(FULLVERSION_BAMBOO_PHP54) || true
-
-
-build_bamboo_php55: build_php55
-	rm -rf build_bamboo-php55
-	cp -pR bamboo-remote-agent-php55 build_bamboo-php55
-	echo system.imageVersion=$(FULLVERSION_BAMBOO_PHP55) >> build_bamboo-php55/config/bamboo/bamboo-capabilities.properties
-	docker build -t $(NAME_BAMBOO_PHP55):$(FULLVERSION_BAMBOO_PHP55) build_bamboo-php55
-
-release_bamboo_php55:
-	@if ! docker images $(NAME_BAMBOO_PHP55) | awk '{ print $$2 }' | grep -q -F $(FULLVERSION_BAMBOO_PHP55); then \
-		echo "$(NAME_BAMBOO_PHP55) version $(FULLVERSION_BAMBOO_PHP55) is not yet built. Please run 'make build'"; false; \
-	fi
-	docker tag $(NAME_BAMBOO_PHP55):$(FULLVERSION_BAMBOO_PHP55) $(NAME_BAMBOO_PHP55):$(SHORTVERSION_BAMBOO_PHP55)
-	docker tag $(NAME_BAMBOO_PHP55):$(FULLVERSION_BAMBOO_PHP55) $(NAME_BAMBOO_PHP55):latest
-	docker push $(NAME_BAMBOO_PHP55):latest
-	docker push $(NAME_BAMBOO_PHP55):$(FULLVERSION_BAMBOO_PHP55)
-	docker push $(NAME_BAMBOO_PHP55):$(SHORTVERSION_BAMBOO_PHP55)
-
-clean_bamboo_php55:
-	rm -rf build_bamboo-php55
-
-clean_images_bamboo_php55:
-	docker rmi $(NAME_BAMBOO_PHP55):latest || true
-	docker rmi $(NAME_BAMBOO_PHP55):$(SHORTVERSION_BAMBOO_PHP55) || true
-	docker rmi $(NAME_BAMBOO_PHP55):$(FULLVERSION_BAMBOO_PHP55) || true
-
-
-build_bamboo_php56: build_php56
-	rm -rf build_bamboo-php56
-	cp -pR bamboo-remote-agent-php56 build_bamboo-php56
-	echo system.imageVersion=$(FULLVERSION_BAMBOO_PHP56) >> build_bamboo-php56/config/bamboo/bamboo-capabilities.properties
-	docker build -t $(NAME_BAMBOO_PHP56):$(FULLVERSION_BAMBOO_PHP56) build_bamboo-php56
-
-release_bamboo_php56:
-	@if ! docker images $(NAME_BAMBOO_PHP56) | awk '{ print $$2 }' | grep -q -F $(FULLVERSION_BAMBOO_PHP56); then \
-		echo "$(NAME_BAMBOO_PHP56) version $(FULLVERSION_BAMBOO_PHP56) is not yet built. Please run 'make build'"; false; \
-	fi
-	docker tag $(NAME_BAMBOO_PHP56):$(FULLVERSION_BAMBOO_PHP56) $(NAME_BAMBOO_PHP56):$(SHORTVERSION_BAMBOO_PHP56)
-	docker tag $(NAME_BAMBOO_PHP56):$(FULLVERSION_BAMBOO_PHP56) $(NAME_BAMBOO_PHP56):latest
-	docker push $(NAME_BAMBOO_PHP56):latest
-	docker push $(NAME_BAMBOO_PHP56):$(FULLVERSION_BAMBOO_PHP56)
-	docker push $(NAME_BAMBOO_PHP56):$(SHORTVERSION_BAMBOO_PHP56)
-
-clean_bamboo_php56:
-	rm -rf build_bamboo-php56
-
-clean_images_bamboo_php56:
-	docker rmi $(NAME_BAMBOO_PHP56):latest || true
-	docker rmi $(NAME_BAMBOO_PHP56):$(SHORTVERSION_BAMBOO_PHP56) || true
-	docker rmi $(NAME_BAMBOO_PHP56):$(FULLVERSION_BAMBOO_PHP56) || true
-
-
-build_bamboo_php70: build_php70
-	rm -rf build_bamboo-php70
-	cp -pR bamboo-remote-agent-php70 build_bamboo-php70
-	echo system.imageVersion=$(FULLVERSION_BAMBOO_PHP70) >> build_bamboo-php70/config/bamboo/bamboo-capabilities.properties
-	docker build -t $(NAME_BAMBOO_PHP70):$(FULLVERSION_BAMBOO_PHP70) build_bamboo-php70
-
-release_bamboo_php70:
-	@if ! docker images $(NAME_BAMBOO_PHP70) | awk '{ print $$2 }' | grep -q -F $(FULLVERSION_BAMBOO_PHP70); then \
-		echo "$(NAME_BAMBOO_PHP70) version $(FULLVERSION_BAMBOO_PHP70) is not yet built. Please run 'make build'"; false; \
-	fi
-	docker tag $(NAME_BAMBOO_PHP70):$(FULLVERSION_BAMBOO_PHP70) $(NAME_BAMBOO_PHP70):$(SHORTVERSION_BAMBOO_PHP70)
-	docker tag $(NAME_BAMBOO_PHP70):$(FULLVERSION_BAMBOO_PHP70) $(NAME_BAMBOO_PHP70):latest
-	docker push $(NAME_BAMBOO_PHP70):latest
-	docker push $(NAME_BAMBOO_PHP70):$(FULLVERSION_BAMBOO_PHP70)
-	docker push $(NAME_BAMBOO_PHP70):$(SHORTVERSION_BAMBOO_PHP70)
-
-clean_bamboo_php70:
-	rm -rf build_bamboo-php70
-
-clean_images_bamboo_php70:
-	docker rmi $(NAME_BAMBOO_PHP70):latest || true
-	docker rmi $(NAME_BAMBOO_PHP70):$(SHORTVERSION_BAMBOO_PHP70) || true
-	docker rmi $(NAME_BAMBOO_PHP70):$(FULLVERSION_BAMBOO_PHP70) || true
-
-
-build_bamboo_php71: build_php71
-	rm -rf build_bamboo-php71
-	cp -pR bamboo-remote-agent-php71 build_bamboo-php71
-	echo system.imageVersion=$(FULLVERSION_BAMBOO_PHP71) >> build_bamboo-php71/config/bamboo/bamboo-capabilities.properties
-	docker build -t $(NAME_BAMBOO_PHP71):$(FULLVERSION_BAMBOO_PHP71) build_bamboo-php71
-
-release_bamboo_php71:
-	@if ! docker images $(NAME_BAMBOO_PHP71) | awk '{ print $$2 }' | grep -q -F $(FULLVERSION_BAMBOO_PHP71); then \
-		echo "$(NAME_BAMBOO_PHP71) version $(FULLVERSION_BAMBOO_PHP71) is not yet built. Please run 'make build'"; false; \
-	fi
-	docker tag $(NAME_BAMBOO_PHP71):$(FULLVERSION_BAMBOO_PHP71) $(NAME_BAMBOO_PHP71):$(SHORTVERSION_BAMBOO_PHP71)
-	docker tag $(NAME_BAMBOO_PHP71):$(FULLVERSION_BAMBOO_PHP71) $(NAME_BAMBOO_PHP71):latest
-	docker push $(NAME_BAMBOO_PHP71):latest
-	docker push $(NAME_BAMBOO_PHP71):$(FULLVERSION_BAMBOO_PHP71)
-	docker push $(NAME_BAMBOO_PHP71):$(SHORTVERSION_BAMBOO_PHP71)
-
-clean_bamboo_php71:
-	rm -rf build_bamboo-php71
-
-clean_images_bamboo_php71:
-	docker rmi $(NAME_BAMBOO_PHP71):latest || true
-	docker rmi $(NAME_BAMBOO_PHP71):$(SHORTVERSION_BAMBOO_PHP71) || true
-	docker rmi $(NAME_BAMBOO_PHP71):$(FULLVERSION_BAMBOO_PHP71) || true
-
-
-build_bamboo_php72: build_php72
-	rm -rf build_bamboo-php72
-	cp -pR bamboo-remote-agent-php72 build_bamboo-php72
-	echo system.imageVersion=$(FULLVERSION_BAMBOO_PHP72) >> build_bamboo-php72/config/bamboo/bamboo-capabilities.properties
-	docker build -t $(NAME_BAMBOO_PHP72):$(FULLVERSION_BAMBOO_PHP72) build_bamboo-php72
-
-release_bamboo_php72:
-	@if ! docker images $(NAME_BAMBOO_PHP72) | awk '{ print $$2 }' | grep -q -F $(FULLVERSION_BAMBOO_PHP72); then \
-		echo "$(NAME_BAMBOO_PHP72) version $(FULLVERSION_BAMBOO_PHP72) is not yet built. Please run 'make build'"; false; \
+release_bamboo:
+	@if ! docker images $(NAME_BAMBOO) | awk '{ print $$2 }' | grep -q -F $(FULLVERSION_BAMBOO); then \
+		echo "$(NAME_BAMBOO) version $(FULLVERSION_BAMBOO) is not yet built. Please run 'make build'"; false; \
 	fi
-	docker tag $(NAME_BAMBOO_PHP72):$(FULLVERSION_BAMBOO_PHP72) $(NAME_BAMBOO_PHP72):$(SHORTVERSION_BAMBOO_PHP72)
-	docker tag $(NAME_BAMBOO_PHP72):$(FULLVERSION_BAMBOO_PHP72) $(NAME_BAMBOO_PHP72):latest
-	docker push $(NAME_BAMBOO_PHP72):latest
-	docker push $(NAME_BAMBOO_PHP72):$(FULLVERSION_BAMBOO_PHP72)
-	docker push $(NAME_BAMBOO_PHP72):$(SHORTVERSION_BAMBOO_PHP72)
-
-clean_bamboo_php72:
-	rm -rf build_bamboo-php72
-
-clean_images_bamboo_php72:
-	docker rmi $(NAME_BAMBOO_PHP72):latest || true
-	docker rmi $(NAME_BAMBOO_PHP72):$(SHORTVERSION_BAMBOO_PHP72) || true
-	docker rmi $(NAME_BAMBOO_PHP72):$(FULLVERSION_BAMBOO_PHP72) || true
+	docker tag $(NAME_BAMBOO):$(FULLVERSION_BAMBOO) $(NAME_BAMBOO):$(SHORTVERSION_BAMBOO)
+	docker tag $(NAME_BAMBOO):$(FULLVERSION_BAMBOO) $(NAME_BAMBOO):latest
+	docker push $(NAME_BAMBOO):latest
+	docker push $(NAME_BAMBOO):$(FULLVERSION_BAMBOO)
+	docker push $(NAME_BAMBOO):$(SHORTVERSION_BAMBOO)
+
+clean_bamboo:
+	rm -rf build_bamboo
+
+clean_images_bamboo:
+	docker rmi $(NAME_BAMBOO):latest || true
+	docker rmi $(NAME_BAMBOO):$(SHORTVERSION_BAMBOO) || true
+	docker rmi $(NAME_BAMBOO):$(FULLVERSION_BAMBOO) || true
--- a/README.md
+++ b/README.md
@@ -31,46 +31,26 @@ correct use within Docker containers. It is Ubuntu, plus:

 * Modifications for Docker-friendliness.
 * Administration tools that are especially useful in the context of Docker.
- * Mechanisms for easily running multiple processes, without violating the Docker philosophy.

 baseimage is a fork from [passenger-docker](https://github.com/phusion/passenger-docker).


 ### phpXY

-Images on top of baseimage. The images are "all-in-one" container that contain both PHP as well as
-various daemons and databases at the same time.
+Images on top of baseimage. The images contain php in one version per container, nodejs and
+some other packages like graphicsmagick.

 * Single images per PHP version. There is an image coming with PHP 7.0 and an image for PHP 7.1 and so on.
-* The images package and start a mariaDB, a PostgreSQL, and have sqlite3 installed.
-* Various other services like a memcache and a redis daemon.
-* A chrome browser, used "headless" to execute acceptance tests.

-Users can start these images to execute unit, functional, acceptance and JS tests in an environment that is identical
-to the core testing infrastructure.
+Users can use these images to execute unit, functional, acceptance and JS tests in an environment that is
+identical to the core testing infrastructure. Note that some core tests need additional containers that
+run a database or selenium with chrome.

 Simple usage example, executing accepance tests on a fresh core clone:

-```
-# 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: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/
-export HOME=/root typo3DatabaseName="func" typo3DatabaseUsername="funcu" typo3DatabasePassword="funcp" typo3DatabaseHost="localhost"
-COMPOSER_ROOT_VERSION=9.1.0 composer install
-php -S localhost:8000 >/dev/null 2>&1 &
-./bin/chromedriver --url-base=/wd/hub >/dev/null 2>&1 &
-./bin/codecept run Acceptance -d -c vendor/typo3/testing-framework/Resources/Core/Build/AcceptanceTests.yml
-```
-
-The images allow running mysql in a ramdisk to speed up functional tests and allows to use an already
-existing local core or typo3 instance as code source.
-
-
-### bamboo-remote-agent-phpXY
-
-typo3gmbh/bamboo-remote-agent-phpXY adds the bamboo test runner on top of the phpXY images for integration in
-TYPO3 GmbH testing infrastructure. Users usually don't have to deal with these images and use the phpXY ones instead.
\ No newline at end of file
+
+
+### bamboo-remote-agent
+
+typo3gmbh/bamboo-remote-agent adds the bamboo test runner on top of the baseimage images for integration in
+TYPO3 GmbH testing infrastructure. Users usually don't have to deal with these images and use the phpXY ones instead.
--- a/bamboo-remote-agent-php53/bamboo-agent.sh
+++ b/bamboo-remote-agent-php53/bamboo-agent.sh
-#!/bin/bash
-set -e
-source /pd_build/buildconfig
-set -x
-
-# Create bamboo work directory
-mkdir -p /srv/bamboo-agent-home
-chmod 0775 /srv/bamboo-agent-home
-chown bamboo:bamboo /srv/bamboo-agent-home
-
-# Install bamboo remote agent
-curl -SL --progress-bar https://bamboo.typo3.com/agentServer/agentInstaller/ -o /tmp/bamboo-installer.jar
-/usr/bin/java -Dbamboo.home=/srv/bamboo-agent-home -jar /tmp/bamboo-installer.jar https://bamboo.typo3.com/agentServer install
-chown -R bamboo:bamboo /srv/bamboo-agent-home
-rm -f /tmp/bamboo-installer.jar
-
-## Configure properties
-cp -a /pd_build/config/bamboo/bamboo-capabilities.properties /srv/bamboo-agent-home/bin
-
-## Enable agent
-cp -a /pd_build/runit/bamboo-agent /etc/service/bamboo-agent
--- a/bamboo-remote-agent-php53/buildconfig
+++ b/bamboo-remote-agent-php53/buildconfig
-export LC_ALL=C
-export DEBIAN_FRONTEND=noninteractive
-
-function minimal_apt_get_install()
-{
-	if [[ ! -e /var/lib/apt/lists/lock ]]; then
-		apt-get update
-	fi
-	apt-get install -y --no-install-recommends "$@"
-}
-
--- a/bamboo-remote-agent-php53/config/bamboo/bamboo-capabilities.properties
+++ b/bamboo-remote-agent-php53/config/bamboo/bamboo-capabilities.properties
-system.phpVersion=5.3
--- a/bamboo-remote-agent-php53/finalize.sh
+++ b/bamboo-remote-agent-php53/finalize.sh
-#!/bin/bash
-set -e
-source /pd_build/buildconfig
-set -x
-
-apt-get clean
-rm -rf \
-    /var/lib/apt/lists/* \
-	/tmp/* \
-	/var/tmp/* \
-	/usr/local/src/* \
-	#
-
-rm -rf /pd_build
--- a/bamboo-remote-agent-php53/install.sh
+++ b/bamboo-remote-agent-php53/install.sh
-#!/bin/bash
-set -e
-source /pd_build/buildconfig
-set -x
-
-/pd_build/prepare.sh
-/pd_build/bamboo-agent.sh
-/pd_build/finalize.sh
--- a/bamboo-remote-agent-php53/prepare.sh
+++ b/bamboo-remote-agent-php53/prepare.sh
-#!/bin/bash
-set -e
-source /pd_build/buildconfig
-set -x
--- a/bamboo-remote-agent-php53/runit/bamboo-agent/log/run
+++ b/bamboo-remote-agent-php53/runit/bamboo-agent/log/run
-#!/bin/sh
-mkdir -p /var/log/bamboo-agent
-exec svlogd -tt /var/log/bamboo-agent
--- a/bamboo-remote-agent-php53/runit/bamboo-agent/run
+++ b/bamboo-remote-agent-php53/runit/bamboo-agent/run
-#!/bin/sh
-exec 2>&1
-exec /sbin/setuser bamboo /srv/bamboo-agent-home/bin/bamboo-agent.sh console
--- a/bamboo-remote-agent-php54/Dockerfile
+++ b/bamboo-remote-agent-php54/Dockerfile
-FROM typo3gmbh/php54:2.0
-MAINTAINER TYPO3 GmbH <info@typo3.com>
-
-ADD . /pd_build
-RUN /pd_build/install.sh
-CMD ["/sbin/my_init"]
--- a/bamboo-remote-agent-php54/bamboo-agent.sh
+++ b/bamboo-remote-agent-php54/bamboo-agent.sh
-#!/bin/bash
-set -e
-source /pd_build/buildconfig
-set -x
-
-# Create bamboo work directory
-mkdir -p /srv/bamboo-agent-home
-chmod 0775 /srv/bamboo-agent-home
-chown bamboo:bamboo /srv/bamboo-agent-home
-
-# Install bamboo remote agent
-curl -SL --progress-bar https://bamboo.typo3.com/agentServer/agentInstaller/ -o /tmp/bamboo-installer.jar
-/usr/bin/java -Dbamboo.home=/srv/bamboo-agent-home -jar /tmp/bamboo-installer.jar https://bamboo.typo3.com/agentServer install
-chown -R bamboo:bamboo /srv/bamboo-agent-home
-rm -f /tmp/bamboo-installer.jar
-
-## Configure properties
-cp -a /pd_build/config/bamboo/bamboo-capabilities.properties /srv/bamboo-agent-home/bin
-
-## Enable agent
-cp -a /pd_build/runit/bamboo-agent /etc/service/bamboo-agent
--- a/bamboo-remote-agent-php54/config/bamboo/bamboo-capabilities.properties
+++ b/bamboo-remote-agent-php54/config/bamboo/bamboo-capabilities.properties
-system.phpVersion=5.4
--- a/bamboo-remote-agent-php54/finalize.sh
+++ b/bamboo-remote-agent-php54/finalize.sh
-#!/bin/bash
-set -e
-source /pd_build/buildconfig
-set -x
-
-apt-get clean
-rm -rf \
-    /var/lib/apt/lists/* \
-	/tmp/* \
-	/var/tmp/* \
-	/usr/local/src/* \
-	#