Update docker setup

This commit is contained in:
Eike Kettner 2020-04-30 22:38:53 +02:00
parent 45ff865ed1
commit 8f46f6b57b
5 changed files with 17 additions and 6 deletions

11
docker/build-images.sh Executable file
View File

@ -0,0 +1,11 @@
#!/usr/bin/env bash
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.5.0 -f joex.dockerfile .
docker build -t eikek0/docspell:restserver-0.5.0 -f restserver.dockerfile .
# test with docker-compose up

View File

@ -1,7 +1,7 @@
version: '3.7'
services:
restserver:
image: eikek0/docspell:restserver-0.4.0
image: eikek0/docspell:restserver-0.5.0
container_name: docspell-restserver
command: /opt/docspell.conf
ports:
@ -20,7 +20,7 @@ services:
- POSTGRES_PASSWORD=dbpass
- POSTGRES_DB=dbname
joex:
image: eikek0/docspell:joex-0.4.0
image: eikek0/docspell:joex-0.5.0
container_name: docspell-joex
command: /opt/docspell.conf
ports:

View File

@ -24,7 +24,7 @@ RUN apk add --no-cache openjdk11-jre \
&& 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.4.0/docspell-joex-0.4.0.zip \
&& curl -L -o docspell.zip https://github.com/eikek/docspell/releases/download/v0.5.0/docspell-joex-0.5.0.zip \
&& unzip docspell.zip \
&& rm docspell.zip \
&& apk del curl unzip

View File

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

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