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

---
 Dockerfile | 37 ++++---------------------------------
 README.md  |  8 +++-----
 2 files changed, 7 insertions(+), 38 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8012b13..27bbff0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,40 +1,11 @@
 # Confluence
 #
 # REPOSITORY registry.codemate.se/confluence
-# 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 && \
@@ -48,14 +19,14 @@ RUN \
   sed -i -e "s/^bind-address\s*=\s*127.0.0.1/bind-address = 0.0.0.0/" /etc/mysql/my.cnf
 
 # Default Environment
-ENV CONFLUENCE_VERSION 5.5.4
+ENV CONFLUENCE_VERSION 5.5.6
 ENV CONFLUENCE_HOME /home/confluence
 
 # Add startup script
 ADD init.sh /init.sh
 
 # Expose ports
-EXPOSE 25 3306 8090 8091
+EXPOSE 8090 8091
 
 # Start Confluence
 CMD ["sh", "/init.sh"]
diff --git a/README.md b/README.md
index 39b2ad2..4b332b2 100644
--- a/README.md
+++ b/README.md
@@ -39,10 +39,10 @@ docker run -v /data/confluence:/home/confluence -d registry.codemate.se/confluen
 
 ### Running a different Confluence version
 
-By default, the container downloads and installs Confluence v5.5.4 on the first boot. To specify which version to install, set the environment variable `CONFLUENCE_VERSION`:
+By default, the container downloads and installs Confluence v5.5.6 on the first boot. To specify which version to install, set the environment variable `CONFLUENCE_VERSION`:
 
 ```
-docker run -e CONFLUENCE_VERSION=5.5.4 -d registry.codemate.se/confluence
+docker run -e CONFLUENCE_VERSION=5.5.6 -d registry.codemate.se/confluence
 ```
 
 ### Overiding Confluence files
@@ -84,7 +84,7 @@ The following example shows the options we use for our CI environment:
 docker run \
   --name confluence \
   -e JAVA_OPTS=-Xmx1024m \
-  -e CONFLUENCE_VERSION=5.5.4 \
+  -e CONFLUENCE_VERSION=5.5.6 \
   -e CONFLUENCE_OVERLAY=http://10.0.0.1/confluence-config.tgz \
   -v /opt/application-data/confluence:/home/confluence \
   -p 8090:8090 \
@@ -105,7 +105,5 @@ docker run \
 
 ## Exposed ports
 
-* `25` - Exim SMTP
-* `3306` - MySQL
 * `8090` - Confluence web interface
 * `8091` - Confluence web interface (extra)
-- 
GitLab