From 7b086dc22983aebcbe6e53c5234231d6bb195851 Mon Sep 17 00:00:00 2001
From: Tim Sutton <tim@linfiniti.com>
Date: Mon, 13 Oct 2014 04:55:43 +0800
Subject: [PATCH] Merge branch 'develop'
---
Dockerfile | 2 +-
resources/README.txt | 1 +
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index d048b81..d257a7c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,7 +24,7 @@
# A little logic that will fetch the geoserver zip file if it
# is not available locally in the resources dir and
RUN if [ ! -f /tmp/resources/geoserver/zip ]; then \
- wget -c http://downloads.sourceforge.net/project/geoserver/GeoServer/2.5.1/geoserver-2.5.1-bin.zip -O /tmpresources/geoserver.zip; \
+ wget -c http://downloads.sourceforge.net/project/geoserver/GeoServer/2.5.2/geoserver-2.5.2-bin.zip -O /tmpresources/geoserver.zip; \
fi; \
unzip /tmp/resources/geoserver.zip -d /opt && mv -v /opt/geoserver* /opt/geoserver
ENV GEOSERVER_HOME /opt/geoserver
diff --git a/resources/README.txt b/resources/README.txt
new file mode 100644
index 0000000..2c6756d
--- /dev/null
+++ b/resources/README.txt
@@ -0,0 +1 @@
+Resources needed in teh image at build time should be placed here.
--
Gitblit v0.0.0-SNAPSHOT