From 84c471309a141a6ab5d97093804f6dddc334dfbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20Hedenstr=C3=B6m?= <erik@codemate.se>
Date: Mon, 1 Sep 2014 15:21:24 +0200
Subject: [PATCH] Switched to codemate java base.

---
 Dockerfile | 33 ++-------------------------------
 1 file changed, 2 insertions(+), 31 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8938fd8..e7c4ed2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,40 +1,11 @@
 # Jetty
 #
 # REPOSITORY registry.codemate.se/jetty
-# VERSION 1.0.0
+# VERSION 1.1.0
 
-FROM dockerfile/java
+FROM registry.codemate.se/java:1.0.0
 MAINTAINER Erik Hedenström <erik@codemate.se>
 
-# Set the env variables to non-interactive
-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 && \
-  dpkg-reconfigure -f noninteractive tzdata
-
-# Fix locale
-RUN \
-  locale-gen en_US.UTF-8 && \
-  echo "LANG=\"en_US.UTF-8\"" > /etc/default/locale && \
-  echo "LANGUAGE=\"en_US.UTF8\"" >> /etc/default/locale && \
-  echo "LC_ALL=\"en_US.UTF8\"" >> /etc/default/locale
-
-# Import self-signed cert as trusted CA
-RUN \
-  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 \
   apt-get -y install exim4-daemon-light && \
-- 
GitLab