Added support for 2.x series in docker-compose examples
diff --git a/.env b/.env
index 611cd7c..99f62a6 100644
--- a/.env
+++ b/.env
@@ -14,3 +14,9 @@
# limitations under the License.
TAG=1.28.1
+# For 2.x series
+#TIKA_JAR=tika-server-standard
+#TIKA_SERVER_CLASS=org.apache.tika.server.core.TikaServerCli
+# For 1.x series
+TIKA_JAR=tika-server
+TIKA_SERVER_CLASS=org.apache.tika.server.TikaServerCli
\ No newline at end of file
diff --git a/docker-compose-tika-customocr.yml b/docker-compose-tika-customocr.yml
index 04a1291..b8dde5d 100644
--- a/docker-compose-tika-customocr.yml
+++ b/docker-compose-tika-customocr.yml
@@ -20,7 +20,7 @@
tika:
image: apache/tika:${TAG}-full
# Override default so we can add configuration on classpath
- entrypoint: [ "/bin/sh", "-c", "exec java -cp /customocr:/tika-server-${TAG}.jar org.apache.tika.server.TikaServerCli -h 0.0.0.0 $$0 $$@"]
+ entrypoint: [ "/bin/sh", "-c", "exec java -cp /customocr:/${TIKA_JAR}-${TAG}.jar org.apache.tika.server.TikaServerCli -h 0.0.0.0 $$0 $$@"]
# Kept command as example but could be added to entrypoint too
command: -c /tika-config.xml
restart: on-failure
diff --git a/docker-compose-tika-grobid.yml b/docker-compose-tika-grobid.yml
index d4fb54a..6062fec 100644
--- a/docker-compose-tika-grobid.yml
+++ b/docker-compose-tika-grobid.yml
@@ -20,7 +20,7 @@
tika:
image: apache/tika:${TAG}-full
# Override default so we can add configuration on classpath
- entrypoint: [ "/bin/sh", "-c", "exec java -cp /grobid:/tika-server-${TAG}.jar org.apache.tika.server.TikaServerCli -h 0.0.0.0 $$0 $$@"]
+ entrypoint: [ "/bin/sh", "-c", "exec java -cp /grobid:/${TIKA_JAR}-${TAG}.jar ${TIKA_SERVER_CLASS} -h 0.0.0.0 $$0 $$@"]
# Kept command as example but could be added to entrypoint too
command: -c /grobid/tika-config.xml
restart: on-failure
diff --git a/docker-compose-tika-ner.yml b/docker-compose-tika-ner.yml
index 54cb24c..11b926b 100644
--- a/docker-compose-tika-ner.yml
+++ b/docker-compose-tika-ner.yml
@@ -26,5 +26,8 @@
- "9998:9998"
volumes:
- ./sample-configs/ner/:/ner/
-
+ environment:
+ - TAG
+ - TIKA_JAR
+ - TIKA_SERVER_CLASS
\ No newline at end of file
diff --git a/sample-configs/ner/run_tika_server.sh b/sample-configs/ner/run_tika_server.sh
index 4e6220e..5e2c2d5 100755
--- a/sample-configs/ner/run_tika_server.sh
+++ b/sample-configs/ner/run_tika_server.sh
@@ -57,6 +57,6 @@
# Can be a single implementation or comma seperated list for multiple for "ner.impl.class" property
RECOGNISERS=org.apache.tika.parser.ner.opennlp.OpenNLPNERecogniser,org.apache.tika.parser.ner.regex.RegexNERecogniser
# Set classpath to the Tika Server JAR and the /ner folder so it has the configuration and models from above
-CLASSPATH=/ner:/tika-server-${TIKA_VERSION}.jar
+CLASSPATH=/ner:/${TIKA_JAR}-${TIKA_VERSION}.jar
# Run the server with the custom configuration ner.impl.class property and custom /ner/tika-config.xml
-exec java -Dner.impl.class=$RECOGNISERS -cp $CLASSPATH org.apache.tika.server.TikaServerCli -h 0.0.0.0 -c /ner/tika-config.xml
\ No newline at end of file
+exec java -Dner.impl.class=$RECOGNISERS -cp $CLASSPATH ${TIKA_SERVER_CLASS} -h 0.0.0.0 -c /ner/tika-config.xml
\ No newline at end of file
