From 5644ced61afcd8b8b89027857f1855769414aeba Mon Sep 17 00:00:00 2001 From: James Nord Date: Mon, 16 May 2022 20:21:15 +0100 Subject: [PATCH 1/2] update agent to use jdk11 and supported Ubuntu LTS --- .../docker/fixtures/JavaGitContainer/Dockerfile | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/JavaGitContainer/Dockerfile b/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/JavaGitContainer/Dockerfile index 9d91d3aee1..eb9e009fd9 100644 --- a/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/JavaGitContainer/Dockerfile +++ b/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/JavaGitContainer/Dockerfile @@ -3,15 +3,16 @@ # and prepares for execution of Java compile jobs on slaves. # -FROM ubuntu:xenial +FROM ubuntu:jammy RUN mkdir -p /var/run/sshd -# install SSHD, Git and zip -RUN apt-get update && apt-get install -y \ +# install SSHD, Git, zip and the JDK +RUN apt-get update && apt-get install --no-install-recommends -y \ openssh-server \ git \ zip \ + openjdk-11-jdk \ && rm -rf /var/lib/apt/lists/* # create a git user and create .ssh dir @@ -28,10 +29,3 @@ CMD /usr/sbin/sshd -D -e # give the whole /home/git back to the git user RUN chown -R git /home/git - -RUN apt-get update -y && apt-get install --no-install-recommends -y software-properties-common - -RUN add-apt-repository ppa:openjdk-r/ppa -RUN apt-get update -RUN apt-get install --no-install-recommends -y \ - openjdk-8-jdk From b86486b2622dd1cc73d46cb7c30b9605abefa92f Mon Sep 17 00:00:00 2001 From: James Nord Date: Mon, 16 May 2022 21:34:32 +0100 Subject: [PATCH 2/2] Update src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/JavaGitContainer/Dockerfile Co-authored-by: Tim Jacomb <21194782+timja@users.noreply.github.com> --- .../test/acceptance/docker/fixtures/JavaGitContainer/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/JavaGitContainer/Dockerfile b/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/JavaGitContainer/Dockerfile index eb9e009fd9..7fa11be178 100644 --- a/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/JavaGitContainer/Dockerfile +++ b/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/JavaGitContainer/Dockerfile @@ -3,7 +3,7 @@ # and prepares for execution of Java compile jobs on slaves. # -FROM ubuntu:jammy +FROM ubuntu:22.04 RUN mkdir -p /var/run/sshd