Now builds on both Open JDK and Oracle JDK. (#3)

* Now builds on both Open JDK and Oracle JDK.

* Updated README to reflect that Oracle JDK is now supported.

Dockerfile

@@ -0,0 +1 @@
+Dockerfile.open-jdk

Dockerfile.open-jdk

@@ -0,0 +1,24 @@
+FROM islandora/claw-tomcat:open-jdk
+MAINTAINER Nigel Banks <nigel.g.banks@gmail.com>
+
+LABEL "License"="MIT" \
+      "Version"="0.0.1"
+
+EXPOSE 61613
+EXPOSE 61616
+
+ARG FEDORA_VERSION="4.4.0"
+
+ENV FEDORA_HOME="/mnt/fedora-data" \
+    CATALINA_OPTS="${CATALINA_OPTS} -Dfcrepo.home=/mnt/fedora-data"
+
+RUN mkdir -p ${FEDORA_HOME} && \
+    chown tomcat:tomcat ${FEDORA_HOME} && \
+    curl -o ${CATALINA_BASE}/webapps/fcrepo.war \
+    -L https://github.com/fcrepo4/fcrepo4/releases/download/fcrepo-${FEDORA_VERSION}/fcrepo-webapp-${FEDORA_VERSION}.war && \
+    mkdir ${CATALINA_BASE}/webapps/fcrepo && \
+    unzip -o ${CATALINA_BASE}/webapps/fcrepo.war -d ${CATALINA_HOME}/webapps/fcrepo && \
+    rm -rf ${CATALINA_HOME}/webapps/*.war && \
+    cleanup
+
+COPY rootfs /

Dockerfile.oracle-jdk

@@ -0,0 +1,24 @@
+FROM islandora/claw-tomcat:oracle-jdk
+MAINTAINER Nigel Banks <nigel.g.banks@gmail.com>
+
+LABEL "License"="MIT" \
+      "Version"="0.0.1"
+
+EXPOSE 61613
+EXPOSE 61616
+
+ARG FEDORA_VERSION="4.4.0"
+
+ENV FEDORA_HOME="/mnt/fedora-data" \
+    CATALINA_OPTS="${CATALINA_OPTS} -Dfcrepo.home=/mnt/fedora-data"
+
+RUN mkdir -p ${FEDORA_HOME} && \
+    chown tomcat:tomcat ${FEDORA_HOME} && \
+    curl -o ${CATALINA_BASE}/webapps/fcrepo.war \
+    -L https://github.com/fcrepo4/fcrepo4/releases/download/fcrepo-${FEDORA_VERSION}/fcrepo-webapp-${FEDORA_VERSION}.war && \
+    mkdir ${CATALINA_BASE}/webapps/fcrepo && \
+    unzip -o ${CATALINA_BASE}/webapps/fcrepo.war -d ${CATALINA_HOME}/webapps/fcrepo && \
+    rm -rf ${CATALINA_HOME}/webapps/*.war && \
+    cleanup
+
+COPY rootfs /

README.md

@@ -48,10 +48,6 @@ For convenience a number of commands are provided in the [commands](/commands) f
 | foreground | [port] [admin password] | 8080 random | Start fedora in the foreground with the given port and password. |
 | background | [port] [admin password] | 8080 random | Start fedora in the background with the given port and password. |
 
-## Notes
-
-Eventually we will support running on either OpenJDK or Oracle JDK, but for the moment it only supports Open JDK.
-
 ## Maintainers/Sponsors
 
 * UPEI

commands/build

@@ -1,3 +1,6 @@
 #!/bin/bash
-readonly DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-docker build -t islandora/claw-fedora $DIR/..
+readonly ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"
+docker build -f $ROOT/Dockerfile.oracle-jdk -t islandora/claw-fedora:oracle-jdk $ROOT
+docker build -f $ROOT/Dockerfile.open-jdk -t islandora/claw-fedora:open-jdk $ROOT
+# Open JDK is the default implementation. 
+docker tag islandora/claw-fedora:open-jdk islandora/claw-fedora:latest