[TASK] Only one bamboo agent depending on baseimage only

40b1aff9 · Christian Kuhn · 8964a12b · 40b1aff9 · 40b1aff9 · 40b1aff9
Commit 40b1aff9 authored Jul 13, 2018 by Christian Kuhn
--- a/Makefile
+++ b/Makefile
@@ -56,54 +56,12 @@ 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=3
-MINOR_BAMBOO_PHP72=0
-PATCHLEVEL_BAMBOO_PHP72=0
-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=0
+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,26 @@ 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-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
+	echo system.imageVersion=$(FULLVERSION_BAMBOO) >> build_bamboo/config/bamboo-capabilities.properties
+	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-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-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-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-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-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-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/bamboo-remote-agent/Dockerfile
+++ b/bamboo-remote-agent/Dockerfile
+FROM typo3gmbh/baseimage:3.0
+MAINTAINER TYPO3 GmbH <info@typo3.com>
+
+ADD . /pd_build
+
+RUN /pd_build/bamboo-agent.sh && \
+    /pd_build/utilities.sh && \
+    /pd_build/finalize.sh
--- a/bamboo-remote-agent/bamboo-agent.sh
+++ b/bamboo-remote-agent/bamboo-agent.sh
+#!/bin/bash
+set -e
+source /pd_build/buildconfig
+set -x
+
+# We don't know which user will execute bamboo, we have to use 777 here
+mkdir -p /srv/bamboo/bin
+chmod 0777 /srv/bamboo
+chmod 0777 /srv/bamboo/bin
+
+# Download bamboo remote agent
+curl -SL --progress-bar https://bamboo.typo3.com/agentServer/agentInstaller/ -o /srv/bamboo-installer.jar
--- a/bamboo-remote-agent/buildconfig
+++ b/bamboo-remote-agent/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/finalize.sh
+++ b/bamboo-remote-agent/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/php72/prepare.sh
+++ b/php72/prepare.sh
 #!/bin/bash
 set -e
-source /pd_build/buildconfig
+source /bd_build/buildconfig
 set -x

-# Install common packages
+# Often used tools.
 minimal_apt_get_install \
-  openssh-client \
-  git \
-  language-pack-de \
-  language-pack-en \
-  openjdk-8-jre-headless \
-  parallel \
-  docker.io \
-  docker-compose \
-  #
+    openjdk-8-jre-headless \
+    docker.io \
+    docker-compose \
+    #

 # git-cherry-pick
 curl -Lo /usr/bin/gerrit-cherry-pick https://review.typo3.org/tools/bin/gerrit-cherry-pick

--- a/baseimage/utilities.sh
+++ b/baseimage/utilities.sh
@@ -18,4 +18,8 @@ $minimal_apt_get_install \
    bzip2 \
    pbzip2 \
    patch \
+    openssh-client \
+    git \
+    language-pack-de \
+    parallel \
    #
--- a/php72/Dockerfile
+++ b/php72/Dockerfile
@@ -4,7 +4,6 @@ MAINTAINER TYPO3 GmbH <info@typo3.com>
 ADD . /pd_build

 RUN /pd_build/enable_repos.sh && \
-    /pd_build/prepare.sh && \
    /pd_build/nodejs.sh && \
    /pd_build/php.sh && \
    /pd_build/finalize.sh