Merge pull request #38 from slub/update-ocrdall-with-workarounds

Update ocrdall with workarounds

.env.example

@@ -7,5 +7,4 @@ CONTROLLER_ENV_UMASK=0002
 CONTROLLER_KEYS=./ocrd/controller/.ssh/authorized_keys
 CONTROLLER_DATA=./ocrd/controller/data
 CONTROLLER_MODELS=./ocrd/controller/models
-CONTROLLER_CONFIG=./ocrd/controller/config
 CONTROLLER_WORKERS=1

Dockerfile

@@ -6,6 +6,7 @@ FROM ocrd/all:$VERSION
 
 ARG VCS_REF
 ARG BUILD_DATE
+ARG VERSION
 
 MAINTAINER [email protected]
 LABEL maintainer="https://slub-dresden.de"
@@ -31,16 +32,14 @@ ENV HOME=/
 
 # must mount a host-side directory for ocrd-resources
 VOLUME /models
+# ensure volume can be written by any user
+RUN chmod go+rwx /models
 # override XDG_DATA_HOME from ocrd/all (i.e. /usr/local/share)
 ENV XDG_DATA_HOME=/models
 # override TESSDATA_PREFIX from ocrd/all
 ENV TESSDATA_PREFIX=$XDG_DATA_HOME/ocrd-resources/ocrd-tesserocr-recognize
-# must mount a host-side directory for ocrd/resource.yml
-VOLUME /config
-ENV XDG_CONFIG_HOME=/config
 # enable caching of METS structures in processors
-# disable while broken, see OCR-D/core#957
-#ENV OCRD_METS_CACHING=true
+ENV OCRD_METS_CACHING=1
 
 # make apt run non-interactive during build
 ENV DEBIAN_FRONTEND noninteractive

docker-compose.yml

@@ -23,7 +23,6 @@ services:
         source: ${CONTROLLER_KEYS:-controller-keys-not-defined} # ocrd manager public key
         target: /authorized_keys
       - ${CONTROLLER_MODELS:-controller-models-not-defined}:/models
-      - ${CONTROLLER_CONFIG:-controller-config-not-defined}:/config
       - ${CONTROLLER_DATA:-controller-data-not-defined}:/data
 
     deploy:

start-sshd.sh

@@ -5,9 +5,6 @@ if ! grep -q ^ocrd: /etc/passwd; then
 # copy the mounted credentials into the user dir
 cat /authorized_keys >> /.ssh/authorized_keys
 
-mkdir -p $TESSDATA_PREFIX
-cp /usr/local/share/tessdata/*.traineddata $TESSDATA_PREFIX/
-
 # silence the greeting
 > /.hushlogin