From b18a7c75a2a6380fcc3f8fd68a6f4968594c656c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20Hedenstr=C3=B6m?= <erik@codemate.se>
Date: Tue, 12 Aug 2014 14:12:39 +0200
Subject: [PATCH] Modified dockerfile to be similar to atlassian variants.
 Bumped version to 1.1.0.

---
 Dockerfile | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 312af5f..135d8ba 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 # Jenkins
 #
 # REPOSITORY registry.codemate.se/jenkins
-# VERSION 1.0.0
+# VERSION 1.1.0
 
 FROM dockerfile/java
 MAINTAINER Erik Hedenström <erik@codemate.se>
@@ -11,6 +11,11 @@ ENV DEBIAN_FRONTEND noninteractive
 ENV DEBIAN_PRIORITY critical
 ENV DEBCONF_NOWARNINGS yes
 
+# Upgrade packages
+RUN \
+  apt-get -y update && \
+  apt-get -y upgrade
+
 # Set Timezone
 RUN \
   echo "Europe/Stockholm" > /etc/timezone && \
@@ -25,8 +30,10 @@ RUN \
 
 # Import self-signed cert as trusted CA
 RUN \
-  openssl s_client -servername cert.codemate.se -connect codemate.se:443 </dev/null | sed -ne '/--BEGIN CERTIFICATE--/,/--END CERTIFICATE--/p' > /tmp/codemate.cert && \
-  keytool -import -noprompt -trustcacerts -keystore /usr/lib/jvm/java-7-oracle/jre/lib/security/cacerts -storepass changeit -noprompt -alias codemate-self-signed -file /tmp/codemate.cert
+  mkdir -p /usr/share/ca-certificates/extra && \
+  openssl s_client -servername cert.codemate.se -connect codemate.se:443 </dev/null | sed -ne '/--BEGIN CERTIFICATE--/,/--END CERTIFICATE--/p' > /usr/share/ca-certificates/extra/codemate.crt && \
+  update-ca-certificates && \
+  keytool -import -noprompt -trustcacerts -keystore /usr/lib/jvm/java-7-oracle/jre/lib/security/cacerts -storepass changeit -noprompt -alias codemate-self-signed -file /usr/share/ca-certificates/extra/codemate.crt
 
 # Install and configure Exim
 RUN \
-- 
GitLab