diff --git a/Dockerfile b/Dockerfile index 312af5f186f1df5027f38be0d580e49d9d1d49eb..135d8ba4b55e5654060753ef05214302c27b23bf 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 \