diff --git a/docker/build-images.sh b/docker/build-images.sh index c2878077..cf87039f 100755 --- a/docker/build-images.sh +++ b/docker/build-images.sh @@ -5,13 +5,13 @@ set -e # Update the versions in joex.dockerfile and restserver.dockerfile, # docker-compose.yml and joex/entrypoint.sh; update versions here -docker build -t eikek0/docspell:joex-0.8.0 -f joex.dockerfile . -docker build -t eikek0/docspell:restserver-0.8.0 -f restserver.dockerfile . -docker build -t eikek0/docspell:consumedir-0.8.0 -f consumedir.dockerfile . +docker build -t eikek0/docspell:joex-0.9.0 -f joex.dockerfile . +docker build -t eikek0/docspell:restserver-0.9.0 -f restserver.dockerfile . +docker build -t eikek0/docspell:consumedir-0.9.0 -f consumedir.dockerfile . -docker tag eikek0/docspell:restserver-0.8.0 eikek0/docspell:restserver-latest -docker tag eikek0/docspell:joex-0.8.0 eikek0/docspell:joex-latest -docker tag eikek0/docspell:consumedir-0.8.0 eikek0/docspell:consumedir-latest +docker tag eikek0/docspell:restserver-0.9.0 eikek0/docspell:restserver-latest +docker tag eikek0/docspell:joex-0.9.0 eikek0/docspell:joex-latest +docker tag eikek0/docspell:consumedir-0.9.0 eikek0/docspell:consumedir-latest diff --git a/docker/consumedir.dockerfile b/docker/consumedir.dockerfile index df0c9c91..beb2ce64 100644 --- a/docker/consumedir.dockerfile +++ b/docker/consumedir.dockerfile @@ -6,10 +6,10 @@ RUN apk add --no-cache unzip curl bash inotify-tools RUN mkdir -p /opt \ && cd /opt \ - && curl -L -o docspell.zip https://github.com/eikek/docspell/releases/download/v0.8.0/docspell-tools-0.8.0.zip \ + && curl -L -o docspell.zip https://github.com/eikek/docspell/releases/download/v0.9.0/docspell-tools-0.9.0.zip \ && unzip docspell.zip \ && rm docspell.zip \ && apk del unzip \ - && chmod 755 /opt/docspell-tools-0.8.0/*.sh + && chmod 755 /opt/docspell-tools-0.9.0/*.sh -ENTRYPOINT ["/opt/docspell-tools-0.8.0/consumedir.sh"] +ENTRYPOINT ["/opt/docspell-tools-0.9.0/consumedir.sh"] diff --git a/docker/entrypoint-joex.sh b/docker/entrypoint-joex.sh index 93c6a8d2..178bccf1 100755 --- a/docker/entrypoint-joex.sh +++ b/docker/entrypoint-joex.sh @@ -3,4 +3,4 @@ echo "Starting unoconv listener" unoconv -l & -/opt/docspell-joex-0.8.0/bin/docspell-joex "$@" +/opt/docspell-joex-0.9.0/bin/docspell-joex "$@" diff --git a/docker/joex.dockerfile b/docker/joex.dockerfile index 2ef463c1..9634cf86 100644 --- a/docker/joex.dockerfile +++ b/docker/joex.dockerfile @@ -28,17 +28,18 @@ RUN apk add --no-cache openjdk11-jre \ python3-dev \ libffi-dev\ qpdf-dev \ + openssl-dev \ && pip3 install --upgrade pip \ - && pip3 install ocrmypdf \ + && pip3 install pdfminer.six==20200517 ocrmypdf \ && curl -Ls $UNO_URL -o /usr/local/bin/unoconv \ && chmod +x /usr/local/bin/unoconv \ && ln -s /usr/bin/python3 /usr/bin/python \ && mkdir -p /opt \ && cd /opt \ - && curl -L -o docspell.zip https://github.com/eikek/docspell/releases/download/v0.8.0/docspell-joex-0.8.0.zip \ + && curl -L -o docspell.zip https://github.com/eikek/docspell/releases/download/v0.9.0/docspell-joex-0.9.0.zip \ && unzip docspell.zip \ && rm docspell.zip \ - && apk del curl unzip libxml2-dev libxslt-dev zlib-dev g++ python3-dev libffi-dev qpdf-dev + && apk del curl unzip libxml2-dev libxslt-dev zlib-dev g++ python3-dev libffi-dev qpdf-dev openssl-dev COPY entrypoint-joex.sh /opt/entrypoint.sh diff --git a/docker/restserver.dockerfile b/docker/restserver.dockerfile index a7e3fc01..c7a335b8 100644 --- a/docker/restserver.dockerfile +++ b/docker/restserver.dockerfile @@ -6,11 +6,11 @@ RUN apk add --no-cache openjdk11-jre unzip curl bash RUN mkdir -p /opt \ && cd /opt \ - && curl -L -o docspell.zip https://github.com/eikek/docspell/releases/download/v0.8.0/docspell-restserver-0.8.0.zip \ + && curl -L -o docspell.zip https://github.com/eikek/docspell/releases/download/v0.9.0/docspell-restserver-0.9.0.zip \ && unzip docspell.zip \ && rm docspell.zip \ && apk del unzip curl EXPOSE 7880 -ENTRYPOINT ["/opt/docspell-restserver-0.8.0/bin/docspell-restserver"] +ENTRYPOINT ["/opt/docspell-restserver-0.9.0/bin/docspell-restserver"]