From f9fa8b1266634427c11ca95b5d7c34ba7b6b4cbe Mon Sep 17 00:00:00 2001
From: Tim Sutton <tim@linfiniti.com>
Date: Sat, 27 Dec 2014 02:54:21 +0800
Subject: [PATCH] Use cmd instead of entrypoint in order to make life easier for fig users
---
Dockerfile | 4 ++--
71-apt-cacher-ng | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/71-apt-cacher-ng b/71-apt-cacher-ng
index 12c66d3..30cbc19 100644
--- a/71-apt-cacher-ng
+++ b/71-apt-cacher-ng
@@ -1,2 +1,2 @@
-Acquire::http { Proxy "http://192.168.2.9:3142"; };
+#Acquire::http { Proxy "http://192.168.2.9:3142"; };
#Acquire::http { Proxy "http://192.168.0.13:3142"; };
diff --git a/Dockerfile b/Dockerfile
index d257a7c..64fc56d 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