From e6389e03847f2d270398d49b531221df6d3e002e Mon Sep 17 00:00:00 2001
From: Alan Hoyle <alan@alanhoyle.com>
Date: Fri, 8 Mar 2019 16:27:42 -0500
Subject: [PATCH 1/2] ENTRYPOINT now includes JAVA_OPTS

---
 docker/Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index a8765d6..01b038a 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -15,5 +15,6 @@ ADD https://github.com/mozack/abra2/releases/download/v${ABRA2_VERSION}/abra2-${
 RUN chmod 755 /abra2-${ABRA2_VERSION}.jar && \
     ln -s /abra2-${ABRA2_VERSION}.jar /abra2.jar 
 
-ENTRYPOINT [ "java", "-jar", "/abra2.jar" ]
+# use "docker run --env JAVA_OPTS=..." to override default java options
+ENTRYPOINT java $JAVA_OPTS -jar /abra2.jar
 # CMD [ --help ]

From 36c7c2ec37f3b48a74777303f2df7f98e8c59ad9 Mon Sep 17 00:00:00 2001
From: Alan Hoyle <alanh@unc.edu>
Date: Fri, 8 Mar 2019 18:27:27 -0500
Subject: [PATCH 2/2] improved abra2 docker behavior, added shell script

---
 docker/Dockerfile   |  8 +++++---
 docker/run-abra2.sh | 26 ++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100644 docker/run-abra2.sh

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 01b038a..773849c 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -11,10 +11,12 @@ ENV ABRA2_VERSION ${ABRA2_VERSION}
 ENV JAVA_OPTS "-Xmx16G"
 
 ADD https://github.com/mozack/abra2/releases/download/v${ABRA2_VERSION}/abra2-${ABRA2_VERSION}.jar /
+ADD run-abra2.sh /
 
-RUN chmod 755 /abra2-${ABRA2_VERSION}.jar && \
+RUN chmod 755 /abra2-${ABRA2_VERSION}.jar /run-abra2.sh && \
     ln -s /abra2-${ABRA2_VERSION}.jar /abra2.jar 
 
-# use "docker run --env JAVA_OPTS=..." to override default java options
-ENTRYPOINT java $JAVA_OPTS -jar /abra2.jar
+
+# CMD java $JAVA_OPTS -jar /abra2.jar
+CMD /run-abra2.sh
 # CMD [ --help ]
diff --git a/docker/run-abra2.sh b/docker/run-abra2.sh
new file mode 100644
index 0000000..30a7573
--- /dev/null
+++ b/docker/run-abra2.sh
@@ -0,0 +1,26 @@
+#! /bin/sh
+
+if [ -z $JAVA_OPTS ] ; then
+    JAVA_OPTS="-Xmx16g"
+fi
+
+if [ -z $1 ] ; then 
+
+    java $JAVA_OPTS -jar /abra2.jar 
+
+    echo ""
+    echo "To use this Docker image, structure your command as follows:"
+    echo ""
+    echo "   docker run abra:$ABRA2_VERSION java $JAVA_OPTS -jar /abra2.jar [options for ABRA2...]"
+    echo ""
+    echo "or pass in your JAVA_OPTS this way"
+    echo ""
+    echo "   docker run --env JAVA_OPTS abra:$ABRA2_VERSION sh /run-abra2.sh [options for ABRA2...]"
+    echo ""
+    echo "Pay special care to set the --tmpdir option to a good location"
+
+else
+
+    java $JAVA_OPTS -jar /abra2.jar $@
+
+fi