TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-06-21 18:08:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adopt docker setup for addons (opt-in)

Browse Source
This commit is contained in:
eikek
2022-05-21 00:44:17 +02:00
parent 47bd6cd0ba
commit d6a2ca48ca
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docker/docker-compose/docker-compose.yml
View File

@ -33,6 +33,7 @@ services:
- DOCSPELL_SERVER_INTEGRATION__ENDPOINT_ENABLED=true - DOCSPELL_SERVER_INTEGRATION__ENDPOINT_ENABLED=true
- DOCSPELL_SERVER_INTEGRATION__ENDPOINT_HTTP__HEADER_ENABLED=true - DOCSPELL_SERVER_INTEGRATION__ENDPOINT_HTTP__HEADER_ENABLED=true
- DOCSPELL_SERVER_INTEGRATION__ENDPOINT_HTTP__HEADER_HEADER__VALUE=integration-password123 - DOCSPELL_SERVER_INTEGRATION__ENDPOINT_HTTP__HEADER_HEADER__VALUE=integration-password123
- DOCSPELL_SERVER_BACKEND_ADDONS_ENABLED=false
depends_on: depends_on:
- solr - solr
@ -53,10 +54,15 @@ services:
- DOCSPELL_JOEX_JDBC_PASSWORD=dbpass - DOCSPELL_JOEX_JDBC_PASSWORD=dbpass
- DOCSPELL_JOEX_JDBC_URL=jdbc:postgresql://db:5432/dbname - DOCSPELL_JOEX_JDBC_URL=jdbc:postgresql://db:5432/dbname
- DOCSPELL_JOEX_JDBC_USER=dbuser - DOCSPELL_JOEX_JDBC_USER=dbuser
- DOCSPELL_JOEX_ADDONS_EXECUTOR__CONFIG_RUNNER=docker,trivial
ports: ports:
- "7878:7878" - "7878:7878"
depends_on: depends_on:
- solr - 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 # The consumedir container watches a directory for files to upload
# to docspell restserver. This uses the `dsc` tool. For information # to docspell restserver. This uses the `dsc` tool. For information

4
docker/dockerfiles/build.sh
View File

@ -16,6 +16,8 @@ if [ -z "$2" ] || [ "$2" == "--push" ]; then
if [ ! -z "$push" ]; then if [ ! -z "$push" ]; then
echo "Running with $push !" echo "Running with $push !"
fi fi
elif [ "$2" == "--load" ]; then
push="$2"
else else
echo "Don't understand second argument: $2" echo "Don't understand second argument: $2"
exit 1 exit 1
@ -32,7 +34,7 @@ cd "$(dirname "$0")"
trap "{ docker buildx rm docspell-builder; }" EXIT 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 docker buildx create --name docspell-builder --use
case $version in case $version in

3
docker/dockerfiles/joex.dockerfile
View File

@ -12,6 +12,7 @@ RUN JDKPKG="openjdk11-jre"; \
tzdata \ tzdata \
bash \ bash \
curl \ curl \
docker \
ghostscript \ ghostscript \
tesseract-ocr \ tesseract-ocr \
tesseract-ocr-data-deu \ tesseract-ocr-data-deu \
@ -54,7 +55,7 @@ RUN JDKPKG="openjdk11-jre"; \
&& pip3 install ocrmypdf \ && pip3 install ocrmypdf \
&& curl -Ls $UNO_URL -o /usr/local/bin/unoconv \ && curl -Ls $UNO_URL -o /usr/local/bin/unoconv \
&& chmod +x /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 && ln -s /usr/bin/python3 /usr/bin/python
WORKDIR /opt WORKDIR /opt