From 6837452dfce7c617651e51680075f4075cc42c42 Mon Sep 17 00:00:00 2001
From: Tim Sutton <tim@linfiniti.com>
Date: Sat, 27 Dec 2014 03:58:10 +0800
Subject: [PATCH] Merge branch 'develop'

---
 Dockerfile |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 02d1b3b..b6e2d70 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -30,6 +30,6 @@
 ENV GEOSERVER_HOME /opt/geoserver
 ENV JAVA_HOME /usr/
 
-ENTRYPOINT "/opt/geoserver/bin/startup.sh"
-#CMD "/opt/geoserver/bin/startup.sh"
+#ENTRYPOINT "/opt/geoserver/bin/startup.sh"
+CMD "/opt/geoserver/bin/startup.sh"
 EXPOSE 8080

--
Gitblit v0.0.0-SNAPSHOT