Merge pull request #390 from jglick/JavaContainer-JENKINS-48310

[JENKINS-48310] Upgrade docker-fixtures
jenkinsci · Dec 6, 2017 · 55d7f95 · 55d7f95
2 parents 58ded58 + 2317671
commit 55d7f95
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -403,7 +403,7 @@
     <dependency>
       <groupId>org.jenkins-ci.test</groupId>
       <artifactId>docker-fixtures</artifactId>
-      <version>1.2</version>
+      <version>1.3</version>
     </dependency>
     <dependency>
       <groupId>com.github.olivergondza.dumpling</groupId>

diff --git a/...n/resources/org/jenkinsci/test/acceptance/docker/fixtures/DockerAgentContainer/Dockerfile b/...n/resources/org/jenkinsci/test/acceptance/docker/fixtures/DockerAgentContainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM jenkins/java:e3665dc1a362
+FROM jenkins/java:fb8985ac2d90
 
 RUN cd /tmp && \
     wget -nv -O - https://get.docker.com/builds/Linux/x86_64/docker-1.13.1.tgz | tar xvfz - docker/docker && \

diff --git a/...main/resources/org/jenkinsci/test/acceptance/docker/fixtures/SshAgentContainer/Dockerfile b/...main/resources/org/jenkinsci/test/acceptance/docker/fixtures/SshAgentContainer/Dockerfile
@@ -1,3 +1,3 @@
-FROM jenkins/java:e3665dc1a362
+FROM jenkins/java:fb8985ac2d90
 COPY *.pub /tmp
 RUN cat /tmp/*.pub >> /home/test/.ssh/authorized_keys
diff --git a/...ain/resources/org/jenkinsci/test/acceptance/docker/fixtures/XvncSlaveContainer/Dockerfile b/...ain/resources/org/jenkinsci/test/acceptance/docker/fixtures/XvncSlaveContainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM jenkins/java:e3665dc1a362
+FROM jenkins/java:fb8985ac2d90
 RUN apt-get update && apt-get install -y vnc4server imagemagick
 
 # So it is owned by root and has the permissions vncserver seems to require: