Merge pull request #71 from rajiesh/master

Use OpenJDK 8
gocd · Jan 18, 2017 · 2d12da0 · 2d12da0
2 parents 8a39e7b + 92ba259
commit 2d12da0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/phusion/agent/Dockerfile b/phusion/agent/Dockerfile
@@ -7,9 +7,9 @@ ARG GO_VERSION="16.8.0-3929"
 ARG DOWNLOAD_URL="https://download.gocd.io/binaries"
 
 RUN rm -rf /etc/service/sshd /etc/my_init.d/00_regen_ssh_host_keys.sh
+RUN add-apt-repository -y ppa:openjdk-r/ppa
 RUN apt-get update
-RUN apt-get upgrade -y
-RUN apt-get install -y -q unzip openjdk-7-jre-headless git mercurial subversion
+RUN apt-get install -y -q unzip openjdk-8-jre-headless git mercurial subversion
 
 RUN mkdir /etc/service/go-agent
 ADD go-agent-start.sh /etc/service/go-agent/run

diff --git a/phusion/server/Dockerfile b/phusion/server/Dockerfile
@@ -8,8 +8,9 @@ ARG GO_VERSION="16.8.0-3929"
 ARG DOWNLOAD_URL="https://download.gocd.io/binaries"
 
 RUN rm -rf /etc/service/sshd /etc/my_init.d/00_regen_ssh_host_keys.sh \
+    && add-apt-repository -y ppa:openjdk-r/ppa \
     && apt-get update \
-    && apt-get install -y -q unzip openjdk-7-jre-headless git mercurial subversion \
+    && apt-get install -y -q unzip openjdk-8-jre-headless git mercurial subversion \
     && mkdir /etc/service/go-server
 
 ADD go-common-scripts.sh /etc/service/go-server/go-common-scripts.sh