From 17bd52cb03c1ce0230de495822218a4f15204def Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20Hedenstr=C3=B6m?= <erik@hedenstroem.com>
Date: Thu, 31 Jul 2014 23:30:07 +0200
Subject: [PATCH] Added apt-get upgrade. Flattened EXPOSE. Fixed start script.

---
 Dockerfile | 12 ++++++++----
 init.sh    |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index dcfc53c..6a35d4d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -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 && \
@@ -47,9 +52,8 @@ ENV CROWD_HOME /home/crowd
 # Add startup script
 ADD init.sh /init.sh
 
+# Expose ports
+EXPOSE 25 3306 8095 8096
+
 # Start Crowd
-EXPOSE 25
-EXPOSE 3306
-EXPOSE 8095
-EXPOSE 8096
 CMD ["sh", "/init.sh"]
diff --git a/init.sh b/init.sh
index 231c45d..23586c8 100644
--- a/init.sh
+++ b/init.sh
@@ -47,4 +47,4 @@ echo "$SEPARATOR"
 
 exim4 -v -bdf -q15m &
 
-exec $CROWD_DIR/bin/start_crowd.sh -fg
+exec $CROWD_DIR/apache-tomcat/bin/catalina.sh run
-- 
GitLab