From dfe677f34f5cca84aaebdc4ded8c85000c950990 Mon Sep 17 00:00:00 2001
From: Shane <shane@axiomdatascience.com>
Date: Tue, 15 Mar 2016 10:54:24 +0800
Subject: [PATCH] Use CATALINA_HOME in Dockerfile
---
Dockerfile | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index ba8e802..c2a94bc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -76,19 +76,19 @@
# A little logic that will fetch the geoserver war zip file if it
# is not available locally in the resources dir
RUN if [ ! -f /tmp/resources/geoserver.zip ]; then \
- wget -c http://downloads.sourceforge.net/project/geoserver/GeoServer/${GS_VERSION}/geoserver-${GS_VERSION}-war.zip \
- -O /tmp/resources/geoserver.zip; \
+ wget -c http://downloads.sourceforge.net/project/geoserver/GeoServer/${GS_VERSION}/geoserver-${GS_VERSION}-war.zip \
+ -O /tmp/resources/geoserver.zip; \
fi; \
unzip /tmp/resources/geoserver.zip -d /tmp/geoserver \
- && unzip /tmp/geoserver/geoserver.war -d /usr/local/tomcat/webapps/geoserver \
- && rm -rf /usr/local/tomcat/webapps/geoserver/data \
+ && unzip /tmp/geoserver/geoserver.war -d $CATALINA_HOME/webapps/geoserver \
+ && rm -rf $CATALINA_HOME/webapps/geoserver/data \
&& rm -rf /tmp/geoserver
# Install any plugin zip files in resources/plugins
RUN if ls /tmp/resources/plugins/*.zip > /dev/null 2>&1; then \
for p in /tmp/resources/plugins/*.zip; do \
unzip $p -d /tmp/gs_plugin \
- && mv /tmp/gs_plugin/*.jar /usr/local/tomcat/webapps/geoserver/WEB-INF/lib/ \
+ && mv /tmp/gs_plugin/*.jar $CATALINA_HOME/webapps/geoserver/WEB-INF/lib/ \
&& rm -rf /tmp/gs_plugin; \
done; \
fi
--
Gitblit v0.0.0-SNAPSHOT