From 1af92f0eab57aa3dabf7607e7f7f12cb21f25d12 Mon Sep 17 00:00:00 2001
From: Tim Sutton <tim@linfiniti.com>
Date: Fri, 10 Oct 2014 22:55:06 +0800
Subject: [PATCH] In progress implementation for geoserver docker

---
 Dockerfile |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c884dfb..92f7a62 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 #--------- Generic stuff all our Dockerfiles should start with so we get caching ------------
-FROM ubuntu:trusty
+FROM consol/tomcat-8.0
 MAINTAINER Tim Sutton<tim@linfiniti.com>
 
 RUN  export DEBIAN_FRONTEND=noninteractive
@@ -18,11 +18,15 @@
 #-------------Application Specific Stuff ----------------------------------------------------
 
 RUN apt-get -y install unzip openjdk-7-jre-headless openjdk-7-jre
-ADD geoserver.zip /tmp/geoserver.zip
-# Next three lines pilfered from 
-# https://ge.dec.wa.gov.au/_/dockers/dpaw_docker/geoserver/Dockerfile
-#RUN wget http://downloads.sourceforge.net/project/geoserver/GeoServer/2.4.1/geoserver-2.4.1-bin.zip -O /tmp/geoserver.zip
-RUN unzip /tmp/geoserver.zip -d /opt && mv -v /opt/geoserver* /opt/geoserver
+
+ADD resources /tmp/resources
+
+# 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; \
+    fi; \
+    unzip /tmp/resources/geoserver.zip -d /opt && mv -v /opt/geoserver* /opt/geoserver
 ENV GEOSERVER_HOME /opt/geoserver
 
 ENTRYPOINT "/opt/geoserver/bin/startup.sh"

--
Gitblit v0.0.0-SNAPSHOT