Add build for debian buster image
We'll use debian buster for the python3 and jekyll images to avoid we
have to compile a current version of python 3 and ruby on our own.
Change-Id: Ic51afcc31b77ef908fd2b813887361aed0f1c98d
diff --git a/jenkins-docker/slave-debian/Dockerfile b/jenkins-docker/slave-debian/Dockerfile
index 7aa544c..f9f7974 100644
--- a/jenkins-docker/slave-debian/Dockerfile
+++ b/jenkins-docker/slave-debian/Dockerfile
@@ -17,7 +17,6 @@
python-dev \
python-pip \
python-yaml \
- python-jenkins \
ant \
autoconf \
automake \
@@ -33,6 +32,8 @@
build-essential \
&& rm -rf /var/lib/apt/lists/*
+RUN pip install python-jenkins
+
ADD https://www.kernel.org/pub/software/scm/git/git-$GIT_VER.tar.gz /tmp/
RUN tar xvfz /tmp/git-$GIT_VER.tar.gz && \
cd git-$GIT_VER && \
diff --git a/jenkins-docker/slave-debian/Makefile b/jenkins-docker/slave-debian/Makefile
index 0fc3d7c..965d9a1 100644
--- a/jenkins-docker/slave-debian/Makefile
+++ b/jenkins-docker/slave-debian/Makefile
@@ -3,31 +3,32 @@
MAVEN_VER=3.6.3
GIT_VER=2.24.0
-build: build_stretch
+build: build_stretch build_buster
-publish: publish_stretch
+publish: publish_stretch publish_buster
-clean: clean_stretch
+clean: clean_stretch clean_buster
build_stretch publish_stretch clean_stretch: DEBIAN_VER=stretch
+build_buster publish_buster clean_buster: DEBIAN_VER=buster
publish_stretch: build_stretch
+publish_buster: build_buster
-build_stretch: id_rsa.pub
+build_stretch build_buster: id_rsa.pub
@echo "Building Docker for Debian:$(DEBIAN_VER)"
@echo "========================================"
cat Dockerfile | DEBIAN_VER=$(DEBIAN_VER) MAVEN_VER=$(MAVEN_VER) GIT_VER=$(GIT_VER) envsubst > Dockerfile-$(DEBIAN_VER)
docker build --no-cache=$(NO_CACHE) -f Dockerfile-$(DEBIAN_VER) -t ${IMAGE}:$(DEBIAN_VER) .
-publish_stretch:
+publish_stretch publish_buster:
docker push ${IMAGE}:$(DEBIAN_VER)
id_rsa.pub: ../master/id_rsa.pub
cp $? $@
-clean_stretch:
+clean_stretch clean_buster:
docker rmi -f ${IMAGE}
-rm -f id_rsa*
.PHONY: clean id_rsa.pub publish
-
