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'
---
Dockerfile | 44 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 42 insertions(+), 2 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 7c16a5f..b076dd2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,12 +16,46 @@
#-------------Application Specific Stuff ----------------------------------------------------
-EXPOSE 8080
-
ENV GS_VERSION 2.6.1
ENV GEOSERVER_DATA_DIR /opt/geoserver/data_dir
+# Unset Java related ENVs since they may change with Oracle JDK
+ENV JAVA_VERSION=
+ENV JAVA_DEBIAN_VERSION=
+
+# Set JAVA_HOME to /usr/lib/jvm/default-java and link it to OpenJDK installation
+RUN ln -s /usr/lib/jvm/java-7-openjdk-amd64 /usr/lib/jvm/default-java
+ENV JAVA_HOME /usr/lib/jvm/default-java
+
ADD resources /tmp/resources
+
+# If a matching Oracle JDK tar.gz exists in /tmp/resources, move it to /var/cache/oracle-jdk7-installer
+# where oracle-java7-installer will detect it
+RUN if ls /tmp/resources/*jdk-*-linux-x64.tar.gz > /dev/null 2>&1; then \
+ mkdir /var/cache/oracle-jdk7-installer && \
+ mv /tmp/resources/*jdk-*-linux-x64.tar.gz /var/cache/oracle-jdk7-installer/; \
+ fi;
+
+# Install Oracle JDK (and uninstall OpenJDK JRE) if the build-arg ORACLE_JDK = true or an Oracle tar.gz
+# was found in /tmp/resources
+ARG ORACLE_JDK=false
+RUN if ls /var/cache/oracle-jdk7-installer/*jdk-*-linux-x64.tar.gz > /dev/null 2>&1 || [ "$ORACLE_JDK" = true ]; then \
+ apt-get autoremove --purge -y openjdk-7-jre-headless && \
+ echo oracle-java7-installer shared/accepted-oracle-license-v1-1 select true \
+ | debconf-set-selections && \
+ echo "deb http://ppa.launchpad.net/webupd8team/java/ubuntu precise main" \
+ > /etc/apt/sources.list.d/webupd8team-java.list && \
+ apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys EEA14886 && \
+ apt-get update && \
+ apt-get install -y oracle-java7-installer oracle-java7-set-default && \
+ ln -s --force /usr/lib/jvm/java-7-oracle /usr/lib/jvm/default-java && \
+ rm -rf /var/lib/apt/lists/* && \
+ rm -rf /var/cache/oracle-jdk7-installer; \
+ if [ -f /tmp/resources/jce_policy.zip ]; then \
+ unzip -j /tmp/resources/jce_policy.zip -d /tmp/jce_policy && \
+ mv /tmp/jce_policy/*.jar $JAVA_HOME/jre/lib/security/; \
+ fi; \
+ fi;
# A little logic that will fetch the geoserver war zip file if it
# is not available locally in the resources dir
@@ -43,5 +77,11 @@
done; \
fi
+# Overlay files and directories in resources/overlays if they exist
+RUN rm /tmp/resources/overlays/README.txt && \
+ if ls /tmp/resources/overlays/* > /dev/null 2>&1; then \
+ cp -rf /tmp/resources/overlays/* /; \
+ fi;
+
# Delete resources after installation
RUN rm -rf /tmp/resources
--
Gitblit v0.0.0-SNAPSHOT