From d6a2ca48ca6c9f3c332dcbe85c1e6f77304eb409 Mon Sep 17 00:00:00 2001
From: eikek <eike.kettner@posteo.de>
Date: Sat, 21 May 2022 00:44:17 +0200
Subject: [PATCH] Adopt docker setup for addons (opt-in)

---
 docker/docker-compose/docker-compose.yml | 6 ++++++
 docker/dockerfiles/build.sh              | 4 +++-
 docker/dockerfiles/joex.dockerfile       | 3 ++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/docker/docker-compose/docker-compose.yml b/docker/docker-compose/docker-compose.yml
index 72325fdc..55a0c6c8 100644
--- a/docker/docker-compose/docker-compose.yml
+++ b/docker/docker-compose/docker-compose.yml
@@ -33,6 +33,7 @@ services:
       - DOCSPELL_SERVER_INTEGRATION__ENDPOINT_ENABLED=true
       - DOCSPELL_SERVER_INTEGRATION__ENDPOINT_HTTP__HEADER_ENABLED=true
       - DOCSPELL_SERVER_INTEGRATION__ENDPOINT_HTTP__HEADER_HEADER__VALUE=integration-password123
+      - DOCSPELL_SERVER_BACKEND_ADDONS_ENABLED=false
     depends_on:
       - solr
 
@@ -53,10 +54,15 @@ services:
       - DOCSPELL_JOEX_JDBC_PASSWORD=dbpass
       - DOCSPELL_JOEX_JDBC_URL=jdbc:postgresql://db:5432/dbname
       - DOCSPELL_JOEX_JDBC_USER=dbuser
+      - DOCSPELL_JOEX_ADDONS_EXECUTOR__CONFIG_RUNNER=docker,trivial
     ports:
       - "7878:7878"
     depends_on:
       - solr
+    ## Uncomment when using the "docker" runner with addons
+    # volumes:
+    #   - /var/run/docker.sock:/var/run/docker.sock
+    #   - /tmp:/tmp
 
   # The consumedir container watches a directory for files to upload
   # to docspell restserver. This uses the `dsc` tool. For information
diff --git a/docker/dockerfiles/build.sh b/docker/dockerfiles/build.sh
index e6b39832..fc66e614 100755
--- a/docker/dockerfiles/build.sh
+++ b/docker/dockerfiles/build.sh
@@ -16,6 +16,8 @@ if [ -z "$2" ] || [ "$2" == "--push" ]; then
     if [ ! -z "$push" ]; then
         echo "Running with $push !"
     fi
+elif [ "$2" == "--load" ]; then
+    push="$2"
 else
     echo "Don't understand second argument: $2"
     exit 1
@@ -32,7 +34,7 @@ cd "$(dirname "$0")"
 
 trap "{ docker buildx rm docspell-builder; }" EXIT
 
-platforms="linux/amd64,linux/arm64,linux/arm/v7"
+platforms=${PLATFORMS:-"linux/amd64,linux/arm64,linux/arm/v7"}
 docker buildx create --name docspell-builder --use
 
 case $version in
diff --git a/docker/dockerfiles/joex.dockerfile b/docker/dockerfiles/joex.dockerfile
index 830fbcd8..cad70533 100644
--- a/docker/dockerfiles/joex.dockerfile
+++ b/docker/dockerfiles/joex.dockerfile
@@ -12,6 +12,7 @@ RUN JDKPKG="openjdk11-jre"; \
     tzdata \
     bash \
     curl \
+    docker \
     ghostscript \
     tesseract-ocr \
     tesseract-ocr-data-deu \
@@ -54,7 +55,7 @@ RUN JDKPKG="openjdk11-jre"; \
   && pip3 install ocrmypdf \
   && curl -Ls $UNO_URL -o /usr/local/bin/unoconv \
   && chmod +x /usr/local/bin/unoconv \
-  && apk del curl libxml2-dev libxslt-dev zlib-dev g++ python3-dev py3-pip libffi-dev qpdf-dev openssl-dev \
+  && apk del libxml2-dev libxslt-dev zlib-dev g++ python3-dev py3-pip libffi-dev qpdf-dev openssl-dev \
   && ln -s /usr/bin/python3 /usr/bin/python
 
 WORKDIR /opt