Skip to content

Commit

Permalink
[JENKINS-48310] Upgrade docker-fixtures.
Browse files Browse the repository at this point in the history
  • Loading branch information
jglick committed Dec 5, 2017
1 parent 58ded58 commit 2317671
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Expand Up @@ -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>
Expand Down
@@ -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 && \
Expand Down
@@ -1,3 +1,3 @@
FROM jenkins/java:e3665dc1a362
FROM jenkins/java:fb8985ac2d90
COPY *.pub /tmp
RUN cat /tmp/*.pub >> /home/test/.ssh/authorized_keys
@@ -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:
Expand Down

0 comments on commit 2317671

Please sign in to comment.