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

Update docker files

Browse Source
This commit is contained in:
Eike Kettner 2020-06-17 22:28:04 +02:00
parent 5c77c3ed18
commit 41964027d1
6 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
docker/build-images.sh
View File

@ -5,11 +5,14 @@ set -e
# Update the versions in joex.dockerfile and restserver.dockerfile, # Update the versions in joex.dockerfile and restserver.dockerfile,
# docker-compose.yml and joex/entrypoint.sh; update versions here # docker-compose.yml and joex/entrypoint.sh; update versions here
docker build -t eikek0/docspell:joex-0.6.0 -f joex.dockerfile . docker build -t eikek0/docspell:joex-0.7.0 -f joex.dockerfile .
docker build -t eikek0/docspell:restserver-0.6.0 -f restserver.dockerfile . docker build -t eikek0/docspell:restserver-0.7.0 -f restserver.dockerfile .
docker build -t eikek0/docspell:consumedir-0.7.0 -f consumedir.dockerfile .
docker tag eikek0/docspell:restserver-0.7.0 eikek0/docspell:restserver-latest
docker tag eikek0/docspell:joex-0.7.0 eikek0/docspell:joex-latest
docker tag eikek0/docspell:consumedir-0.7.0 eikek0/docspell:consumedir-latest
docker tag eikek0/docspell:restserver-0.6.0 eikek0/docspell:restserver-latest
docker tag eikek0/docspell:joex-0.6.0 eikek0/docspell:joex-latest
# test with docker-compose up # test with docker-compose up

6
docker/consumedir.dockerfile
View File

@ -6,10 +6,10 @@ RUN apk add --no-cache unzip curl bash inotify-tools
RUN mkdir -p /opt \ RUN mkdir -p /opt \
&& cd /opt \ && cd /opt \
&& curl -L -o docspell.zip https://github.com/eikek/docspell/releases/download/v0.6.0/docspell-tools-0.6.0.zip \ && curl -L -o docspell.zip https://github.com/eikek/docspell/releases/download/v0.7.0/docspell-tools-0.7.0.zip \
&& unzip docspell.zip \ && unzip docspell.zip \
&& rm docspell.zip \ && rm docspell.zip \
&& apk del unzip \ && apk del unzip \
&& chmod 755 /opt/docspell-tools-0.6.0/*.sh && chmod 755 /opt/docspell-tools-0.7.0/*.sh
ENTRYPOINT ["/opt/docspell-tools-0.6.0/consumedir.sh"] ENTRYPOINT ["/opt/docspell-tools-0.7.0/consumedir.sh"]

6
docker/docker-compose.yml
View File

@ -1,7 +1,7 @@
version: '3.7' version: '3.7'
services: services:
restserver: restserver:
image: eikek0/docspell:restserver-0.6.0 image: eikek0/docspell:restserver-0.7.0
container_name: docspell-restserver container_name: docspell-restserver
command: /opt/docspell.conf command: /opt/docspell.conf
ports: ports:
@ -20,7 +20,7 @@ services:
- POSTGRES_PASSWORD=dbpass - POSTGRES_PASSWORD=dbpass
- POSTGRES_DB=dbname - POSTGRES_DB=dbname
joex: joex:
image: eikek0/docspell:joex-0.6.0 image: eikek0/docspell:joex-0.7.0
container_name: docspell-joex container_name: docspell-joex
command: /opt/docspell.conf command: /opt/docspell.conf
ports: ports:
@ -30,7 +30,7 @@ services:
depends_on: depends_on:
- db - db
consumedir: consumedir:
image: eikek0/docspell:consumedir-0.6.0 image: eikek0/docspell:consumedir-0.7.0
container_name: docspell-consumedir container_name: docspell-consumedir
command: --path /opt/docs -m http://restserver:7880/api/v1/open/upload/item/$SOURCE_ID command: --path /opt/docs -m http://restserver:7880/api/v1/open/upload/item/$SOURCE_ID
environment: environment:

2
docker/joex.dockerfile
View File

@ -24,7 +24,7 @@ RUN apk add --no-cache openjdk11-jre \
&& ln -s /usr/bin/python3 /usr/bin/python \ && ln -s /usr/bin/python3 /usr/bin/python \
&& mkdir -p /opt \ && mkdir -p /opt \
&& cd /opt \ && cd /opt \
&& curl -L -o docspell.zip https://github.com/eikek/docspell/releases/download/v0.6.0/docspell-joex-0.6.0.zip \ && curl -L -o docspell.zip https://github.com/eikek/docspell/releases/download/v0.7.0/docspell-joex-0.7.0.zip \
&& unzip docspell.zip \ && unzip docspell.zip \
&& rm docspell.zip \ && rm docspell.zip \
&& apk del curl unzip && apk del curl unzip

2
docker/joex/entrypoint.sh
View File

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

4
docker/restserver.dockerfile
View File

@ -6,11 +6,11 @@ RUN apk add --no-cache openjdk11-jre unzip curl bash
RUN mkdir -p /opt \ RUN mkdir -p /opt \
&& cd /opt \ && cd /opt \
&& curl -L -o docspell.zip https://github.com/eikek/docspell/releases/download/v0.6.0/docspell-restserver-0.6.0.zip \ && curl -L -o docspell.zip https://github.com/eikek/docspell/releases/download/v0.7.0/docspell-restserver-0.7.0.zip \
&& unzip docspell.zip \ && unzip docspell.zip \
&& rm docspell.zip \ && rm docspell.zip \
&& apk del unzip curl && apk del unzip curl
EXPOSE 7880 EXPOSE 7880
ENTRYPOINT ["/opt/docspell-restserver-0.6.0/bin/docspell-restserver"] ENTRYPOINT ["/opt/docspell-restserver-0.7.0/bin/docspell-restserver"]