From 8f46f6b57bd9422d439b5aa5906fdc717b7477c2 Mon Sep 17 00:00:00 2001
From: Eike Kettner <eike.kettner@posteo.de>
Date: Thu, 30 Apr 2020 22:38:53 +0200
Subject: [PATCH] Update docker setup

---
 docker/build-images.sh       | 11 +++++++++++
 docker/docker-compose.yml    |  4 ++--
 docker/joex.dockerfile       |  2 +-
 docker/joex/entrypoint.sh    |  2 +-
 docker/restserver.dockerfile |  4 ++--
 5 files changed, 17 insertions(+), 6 deletions(-)
 create mode 100755 docker/build-images.sh

diff --git a/docker/build-images.sh b/docker/build-images.sh
new file mode 100755
index 00000000..f9da01cd
--- /dev/null
+++ b/docker/build-images.sh
@@ -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
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index bc3c208f..bb11c5f5 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -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:
diff --git a/docker/joex.dockerfile b/docker/joex.dockerfile
index 58b86407..c08f3ade 100644
--- a/docker/joex.dockerfile
+++ b/docker/joex.dockerfile
@@ -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
diff --git a/docker/joex/entrypoint.sh b/docker/joex/entrypoint.sh
index e27d1938..fca8fac6 100755
--- a/docker/joex/entrypoint.sh
+++ b/docker/joex/entrypoint.sh
@@ -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 "$@"
diff --git a/docker/restserver.dockerfile b/docker/restserver.dockerfile
index a5262910..ee0d7770 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.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"]