From 41964027d1d7ba57e5970dbcfcf4c607ed02a226 Mon Sep 17 00:00:00 2001
From: Eike Kettner <eike.kettner@posteo.de>
Date: Wed, 17 Jun 2020 22:28:04 +0200
Subject: [PATCH] Update docker files

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

diff --git a/docker/build-images.sh b/docker/build-images.sh
index 4eddede8..797c6a35 100755
--- a/docker/build-images.sh
+++ b/docker/build-images.sh
@@ -5,11 +5,14 @@ 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.6.0 -f joex.dockerfile  .
-docker build -t eikek0/docspell:restserver-0.6.0 -f restserver.dockerfile  .
+docker build -t eikek0/docspell:joex-0.7.0 -f joex.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
diff --git a/docker/consumedir.dockerfile b/docker/consumedir.dockerfile
index 6b0fd13c..af22d288 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.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 \
   && rm docspell.zip \
   && 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"]
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index ce28eb03..3d60ec1d 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.6.0
+    image: eikek0/docspell:restserver-0.7.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.6.0
+    image: eikek0/docspell:joex-0.7.0
     container_name: docspell-joex
     command: /opt/docspell.conf
     ports:
@@ -30,7 +30,7 @@ services:
     depends_on:
       - db
   consumedir:
-    image: eikek0/docspell:consumedir-0.6.0
+    image: eikek0/docspell:consumedir-0.7.0
     container_name: docspell-consumedir
     command: --path /opt/docs -m http://restserver:7880/api/v1/open/upload/item/$SOURCE_ID
     environment:
diff --git a/docker/joex.dockerfile b/docker/joex.dockerfile
index 10c6af1d..33c678be 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.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 \
   && rm docspell.zip \
   && apk del curl unzip
diff --git a/docker/joex/entrypoint.sh b/docker/joex/entrypoint.sh
index f0c80012..b7278e7e 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.6.0/bin/docspell-joex "$@"
+/opt/docspell-joex-0.7.0/bin/docspell-joex "$@"
diff --git a/docker/restserver.dockerfile b/docker/restserver.dockerfile
index d8c38583..1d785d63 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.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 \
   && rm docspell.zip \
   && apk del unzip curl
 
 EXPOSE 7880
 
-ENTRYPOINT ["/opt/docspell-restserver-0.6.0/bin/docspell-restserver"]
+ENTRYPOINT ["/opt/docspell-restserver-0.7.0/bin/docspell-restserver"]