From b75a6cfa16ce271eba42e96bb1aada3ee58e75b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Hedenstr=C3=B6m?= <erik@codemate.se> Date: Mon, 1 Sep 2014 15:14:49 +0200 Subject: [PATCH] Changed to codemate java base --- Dockerfile | 35 +++-------------------------------- README.md | 2 -- 2 files changed, 3 insertions(+), 34 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1295e1f..2d1dc2e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,40 +1,11 @@ # Crowd # # REPOSITORY registry.codemate.se/crowd -# 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 && \ @@ -55,7 +26,7 @@ ENV CROWD_HOME /home/crowd ADD init.sh /init.sh # Expose ports -EXPOSE 25 3306 8095 8096 +EXPOSE 8095 8096 # Start Crowd CMD ["sh", "/init.sh"] diff --git a/README.md b/README.md index 2618d57..538fae7 100644 --- a/README.md +++ b/README.md @@ -112,7 +112,5 @@ docker run \ ## Exposed ports -* `25` - Exim SMTP -* `3306` - MySQL * `8095` - Crowd web interface * `8096` - Crowd web interface (extra) -- GitLab