From 4b8c73d3e1cc23701e9b0d4808f180c47348714a Mon Sep 17 00:00:00 2001
From: Tim Sutton <tim@linfiniti.com>
Date: Sun, 12 Oct 2014 20:33:59 +0800
Subject: [PATCH] Basic working version
---
Dockerfile | 2 ++
run.sh | 29 +++++++++++++++++++----------
README.md | 2 +-
3 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 92f7a62..d048b81 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -28,6 +28,8 @@
fi; \
unzip /tmp/resources/geoserver.zip -d /opt && mv -v /opt/geoserver* /opt/geoserver
ENV GEOSERVER_HOME /opt/geoserver
+ENV JAVA_HOME /usr/
ENTRYPOINT "/opt/geoserver/bin/startup.sh"
+#CMD "/opt/geoserver/bin/startup.sh"
EXPOSE 8080
diff --git a/README.md b/README.md
index 714e1c8..9cf4e03 100644
--- a/README.md
+++ b/README.md
@@ -71,7 +71,7 @@
```
mkdir -p ~/geoserver_data
-docker run -d -v $HOME/geoserver_data:/opt/geoserver_data kartoza/geserver
+docker run -d -v $HOME/geoserver_data:/opt/geoserver/data_dir kartoza/geserver
```
You need to ensure the ``geoserver_data`` directory has sufficinet permissions
diff --git a/run.sh b/run.sh
index 8ea0cd2..3891e15 100755
--- a/run.sh
+++ b/run.sh
@@ -1,12 +1,21 @@
-docker.io run --name="osm-africa-postgis" -t -d kartoza/postgis
+#!/bin/bash
+docker kill geoserver
+docker rm geoserver
+docker kill geoserver-postgis
+docker rm geoserver-postgis
-docker.io run \
- --name=tilemill \
- --link osm-africa-postgis:osm-africa-postgis \
- -v /home/gisdata:/home/gisdata \
- -v /home/timlinux/Documents/MapBox:/Documents/MapBox \
- -p 20007:22 \
- -p 20008:20008 \
- -p 20009:20009 \
+DATA_DIR=~/geoserver_data
+if [ ! -d $DATA_DIR ]
+then
+ mkdir -p $DATA_DIR
+fi
+
+docker run --name="geoserver-postgis" -t -d kartoza/postgis
+
+docker run \
+ --name=geoserver \
+ --link geoserver-postgis:postgis \
+ -v $DATA_DIR:/opt/geoserver/data_dir \
+ -p 8080:8080 \
-d \
- -t kartoza/tilemill
+ -t kartoza/geoserver
--
Gitblit v0.0.0-SNAPSHOT