Update nix and docker setups

This commit is contained in:
Eike Kettner
2020-08-15 00:34:33 +02:00
parent f2fbf20f00
commit d68d076c84
6 changed files with 32 additions and 16 deletions

View File

@ -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.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 build -t eikek0/docspell:joex-0.10.0 -f joex.dockerfile .
docker build -t eikek0/docspell:restserver-0.10.0 -f restserver.dockerfile .
docker build -t eikek0/docspell:consumedir-0.10.0 -f consumedir.dockerfile .
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
docker tag eikek0/docspell:restserver-0.10.0 eikek0/docspell:restserver-latest
docker tag eikek0/docspell:joex-0.10.0 eikek0/docspell:joex-latest
docker tag eikek0/docspell:consumedir-0.10.0 eikek0/docspell:consumedir-latest

View File

@ -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.9.0/docspell-tools-0.9.0.zip \
&& curl -L -o docspell.zip https://github.com/eikek/docspell/releases/download/v0.10.0/docspell-tools-0.10.0.zip \
&& unzip docspell.zip \
&& rm docspell.zip \
&& apk del unzip \
&& chmod 755 /opt/docspell-tools-0.9.0/*.sh
&& chmod 755 /opt/docspell-tools-0.10.0/*.sh
ENTRYPOINT ["/opt/docspell-tools-0.9.0/consumedir.sh"]
ENTRYPOINT ["/opt/docspell-tools-0.10.0/consumedir.sh"]

View File

@ -3,4 +3,4 @@
echo "Starting unoconv listener"
unoconv -l &
/opt/docspell-joex-0.9.0/bin/docspell-joex "$@"
/opt/docspell-joex-0.10.0/bin/docspell-joex "$@"

View File

@ -29,14 +29,15 @@ RUN apk add --no-cache openjdk11-jre \
libffi-dev\
qpdf-dev \
openssl-dev \
ocrmypdf \
&& ln -s /usr/bin/python3 /usr/bin/python \
&& pip3 install --upgrade pip \
&& pip3 install pdfminer.six==20200517 ocrmypdf \
&& pip3 install 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.9.0/docspell-joex-0.9.0.zip \
&& curl -L -o docspell.zip https://github.com/eikek/docspell/releases/download/v0.10.0/docspell-joex-0.10.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 openssl-dev

View File

@ -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.9.0/docspell-restserver-0.9.0.zip \
&& curl -L -o docspell.zip https://github.com/eikek/docspell/releases/download/v0.10.0/docspell-restserver-0.10.0.zip \
&& unzip docspell.zip \
&& rm docspell.zip \
&& apk del unzip curl
EXPOSE 7880
ENTRYPOINT ["/opt/docspell-restserver-0.9.0/bin/docspell-restserver"]
ENTRYPOINT ["/opt/docspell-restserver-0.10.0/bin/docspell-restserver"]