From 8383a53de200b231b029daadaf0ca9abe7d2b91d Mon Sep 17 00:00:00 2001
From: Alex Leith <alexgleith@gmail.com>
Date: Mon, 14 Mar 2016 10:38:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'shane-axiom/master'

---
 README.md |   27 +++++++++++++++++++++++++++
 1 files changed, 27 insertions(+), 0 deletions(-)

diff --git a/README.md b/README.md
index 102d19a..d2be021 100644
--- a/README.md
+++ b/README.md
@@ -40,6 +40,22 @@
 docker build -t kartoza/postgis .
 ```
 
+### Building with Oracle JDK
+
+To replace OpenJDK Java with the Oracle JDK, set build-arg `OPEN_JDK=true`:
+
+```shell
+docker build --build-arg OPEN_JDK=true -t kartoza/postgis .
+```
+
+Alternatively, you can download the Oracle JDK 7 Linux x64 tar.gz currently in use by
+[webupd8team's Oracle JDK installer](https://launchpad.net/~webupd8team/+archive/ubuntu/java/+packages)
+(usually the latest version available from Oracle) and place it in `resources` before building.
+
+To enable strong cryptography when using the Oracle JDK (recommended), download the
+[Oracle Java policy jar zip](http://docs.geoserver.org/latest/en/user/production/java.html#oracle-java)
+for the correct JDK version and place it at `resources/jce_policy.zip` before building.
+
 ### Building with plugins
 
 To build a GeoServer image with plugins (e.g. SQL Server plugin, Excel output plugin),
@@ -47,6 +63,17 @@
 `resources/plugins` before building. You should also download the matching version
 GeoServer WAR zip file to `resources/geoserver.zip`.
 
+### Building with file system overlays (advanced)
+
+The contents of `resources/overlays` will be copied to the image file system
+during the build. For example, to include a static Tomcat `setenv.sh`,
+create the file at `resources/overlays/usr/local/tomcat/bin/setenv.sh`.
+
+You can use this functionality to write a static GeoServer directory to
+`/opt/geoserver/data_dir`, include additional jar files, and more.
+
+Overlay files will overwrite existing destination files, so be careful!
+
 ## Run
 
 You probably want to also have postgis running too. To create a running 

--
Gitblit v0.0.0-SNAPSHOT