Move Ammonite to ODKFull.

Ammonite is no longer used by any standard, ODK-generated workflow -- it
was only used by the `make validate_idranges` workflow, which now uses a
dedicated program.

So we move Ammonite to the ODKFull image only, in line with the intended
usage of ODKLite -- ODKLite should contain everything that is required
by standard workflows, and nothing more.

Author: gouttegd

CHANGELOG.md

@@ -14,6 +14,7 @@ For more detailed changes see:
 - New [ROBOT Version 1.9.6](https://github.com/ontodev/robot/releases/tag/v1.9.6). This came with a great number of updates and upgrades, see release notes.
 - J2cli, a command-line tool to process Jinja2 templates, has been replaced by [Jinjanator](https://github.com/kpfleming/jinjanator). If your custom workflows invoke the `j2` tool, you will need to update them to use `jinjanate` instead.
 - New program `dicer-cli` to manage the ID range file.
+- Ammonite, the Scala interpreter, is no longer provided in the ODKLite image. If you need Ammonite, you must now use the ODKFull image.
 
 ## New configuration options
 

Dockerfile

@@ -13,6 +13,7 @@ ENV ODK_VERSION=$ODK_VERSION
 ENV JENA_VERSION=4.9.0
 ENV KGCL_JAVA_VERSION=0.5.0
 ENV SSSOM_JAVA_VERSION=1.0.0
+ENV AMMONITE_VERSION=2.5.9
 
 # Avoid repeated downloads of script dependencies by mounting the local coursier cache:
 # docker run -v $HOME/.coursier/cache/v1:/tools/.coursier-cache ...
@@ -84,6 +85,12 @@ RUN test "x$TARGETARCH" = xamd64 && ( \
 RUN wget -nv http://archive.apache.org/dist/jena/binaries/apache-jena-$JENA_VERSION.tar.gz -O- | tar xzC /tools && \
     mv /tools/apache-jena-$JENA_VERSION /tools/apache-jena
 
+# Install Ammonite
+RUN wget -nv https://github.com/lihaoyi/Ammonite/releases/download/$AMMONITE_VERSION/2.13-$AMMONITE_VERSION \
+        -O /tools/amm && \
+    chmod 755 /tools/amm && \
+    java -cp /tools/amm ammonite.AmmoniteMain /dev/null
+
 # Install SPARQLProg.
 RUN swipl -g "pack_install(sparqlprog, [interactive(false),global(true)])" -g halt
 

Makefile

@@ -35,7 +35,6 @@ test_odklite_programs:
 	@./tests/test-program.sh DOSDP-TOOLS dosdp-tools -v
 	@./tests/test-program.sh OWLTOOLS owltools --version
 	@./tests/test-program.sh OORT ontology-release-runner --help
-	@./tests/test-program.sh AMMONITE sh amm --help
 	@./tests/test-program.sh JINJANATOR jinjanate --version
 	@./tests/test-program.sh DICER-CLI dicer-cli --version
 	@./tests/test-program.sh ODK odk.py
@@ -44,6 +43,7 @@ test_odkfull_programs: test_odklite_programs
 	@./tests/test-program.sh KONCLUDE Konclude -h
 	@./tests/test-program.sh SOUFFLE souffle --version
 	@./tests/test-program.sh JENA jena
+	@./tests/test-program.sh AMMONITE sh amm --help
 	@./tests/test-program.sh SPARQL sparql --version
 	@./tests/test-program.sh SPARQLPROG pl2sparql -g halt
 	@./tests/test-program.sh OBO-DASHBOARD obodash --help

docker/odklite/Dockerfile

@@ -4,7 +4,6 @@ LABEL maintainer="obo-tools@googlegroups.com"
 ENV ROBOT_VERSION=1.9.7
 ENV DOSDP_VERSION=0.19.3
 ENV OWLTOOLS_VERSION=2020-04-06
-ENV AMMONITE_VERSION=2.5.9
 ENV RELATION_GRAPH=2.3.2
 ENV DICER_VERSION=0.1.0
 
@@ -70,12 +69,6 @@ RUN wget -nv https://github.com/owlcollab/owltools/releases/download/$OWLTOOLS_V
     chmod +x /tools/ontology-release-runner && \
     chmod +x /tools/owltools-oort-all.jar
 
-# Install Ammonite.
-RUN wget -nv https://github.com/lihaoyi/Ammonite/releases/download/$AMMONITE_VERSION/2.13-$AMMONITE_VERSION \
-        -O /tools/amm && \
-    chmod 755 /tools/amm && \
-    java -cp /tools/amm ammonite.AmmoniteMain /dev/null
-
 # Install relation-graph
 RUN wget -nv https://github.com/balhoff/relation-graph/releases/download/v$RELATION_GRAPH/relation-graph-cli-$RELATION_GRAPH.tgz && \
     tar -zxvf relation-graph-cli-$RELATION_GRAPH.tgz && \