From ec7b34ee6fb69cedb58f877b3d1e639dfb113882 Mon Sep 17 00:00:00 2001
From: Eike Kettner <eike.kettner@posteo.de>
Date: Mon, 29 Jun 2020 21:01:07 +0200
Subject: [PATCH] Update nix/nixos and docker setups

---
 docker/build-images.sh       | 12 ++++++------
 docker/consumedir.dockerfile |  6 +++---
 docker/entrypoint-joex.sh    |  2 +-
 docker/joex.dockerfile       |  2 +-
 docker/restserver.dockerfile |  4 ++--
 nix/release.nix              | 17 ++++++++++++++++-
 6 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/docker/build-images.sh b/docker/build-images.sh
index 797c6a35..c2878077 100755
--- a/docker/build-images.sh
+++ b/docker/build-images.sh
@@ -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.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 build -t eikek0/docspell:joex-0.8.0 -f joex.dockerfile  .
+docker build -t eikek0/docspell:restserver-0.8.0 -f restserver.dockerfile  .
+docker build -t eikek0/docspell:consumedir-0.8.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.8.0 eikek0/docspell:restserver-latest
+docker tag eikek0/docspell:joex-0.8.0 eikek0/docspell:joex-latest
+docker tag eikek0/docspell:consumedir-0.8.0 eikek0/docspell:consumedir-latest
 
 
 
diff --git a/docker/consumedir.dockerfile b/docker/consumedir.dockerfile
index af22d288..df0c9c91 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.7.0/docspell-tools-0.7.0.zip \
+  && curl -L -o docspell.zip https://github.com/eikek/docspell/releases/download/v0.8.0/docspell-tools-0.8.0.zip \
   && unzip docspell.zip \
   && rm docspell.zip \
   && apk del unzip \
-  && chmod 755 /opt/docspell-tools-0.7.0/*.sh
+  && chmod 755 /opt/docspell-tools-0.8.0/*.sh
 
-ENTRYPOINT ["/opt/docspell-tools-0.7.0/consumedir.sh"]
+ENTRYPOINT ["/opt/docspell-tools-0.8.0/consumedir.sh"]
diff --git a/docker/entrypoint-joex.sh b/docker/entrypoint-joex.sh
index b7278e7e..93c6a8d2 100755
--- a/docker/entrypoint-joex.sh
+++ b/docker/entrypoint-joex.sh
@@ -3,4 +3,4 @@
 echo "Starting unoconv listener"
 unoconv -l &
 
-/opt/docspell-joex-0.7.0/bin/docspell-joex "$@"
+/opt/docspell-joex-0.8.0/bin/docspell-joex "$@"
diff --git a/docker/joex.dockerfile b/docker/joex.dockerfile
index 4322ff17..636926bb 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.7.0/docspell-joex-0.7.0.zip \
+  && curl -L -o docspell.zip https://github.com/eikek/docspell/releases/download/v0.8.0/docspell-joex-0.8.0.zip \
   && unzip docspell.zip \
   && rm docspell.zip \
   && apk del curl unzip
diff --git a/docker/restserver.dockerfile b/docker/restserver.dockerfile
index 1d785d63..a7e3fc01 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.7.0/docspell-restserver-0.7.0.zip \
+  && curl -L -o docspell.zip https://github.com/eikek/docspell/releases/download/v0.8.0/docspell-restserver-0.8.0.zip \
   && unzip docspell.zip \
   && rm docspell.zip \
   && apk del unzip curl
 
 EXPOSE 7880
 
-ENTRYPOINT ["/opt/docspell-restserver-0.7.0/bin/docspell-restserver"]
+ENTRYPOINT ["/opt/docspell-restserver-0.8.0/bin/docspell-restserver"]
diff --git a/nix/release.nix b/nix/release.nix
index de38885b..0f6a07e6 100644
--- a/nix/release.nix
+++ b/nix/release.nix
@@ -1,5 +1,20 @@
 rec {
   cfg = {
+    v0_8_0 = rec {
+      version = "0.8.0";
+      server = {
+        url = "https://github.com/eikek/docspell/releases/download/v${version}/docspell-restserver-${version}.zip";
+        sha256 = "1s4p6ljrzc8d50nsxngwm16jsr7gq8q9nybazdr3mx2g94h7smjw";
+      };
+      joex = {
+        url = "https://github.com/eikek/docspell/releases/download/v${version}/docspell-joex-${version}.zip";
+        sha256 = "16dnb04rbpy0nvzddfrlcfq6a9lypsf666yqfwm1fh42lsy09ji4";
+      };
+      tools = {
+        url = "https://github.com/eikek/docspell/releases/download/v${version}/docspell-tools-${version}.zip";
+        sha256 = "0ziha21pwqqz356q8p2zdd9k4xm8k1p5a7sgbwss2ihplw5zi7vi";
+      };
+    };
     v0_7_0 = rec {
       version = "0.7.0";
       server = {
@@ -107,7 +122,7 @@ rec {
     };
   };
   pkg = v: import ./pkg.nix v;
-  currentPkg = pkg cfg.v0_7_0;
+  currentPkg = pkg cfg.v0_8_0;
   module-joex = ./module-joex.nix;
   module-restserver = ./module-server.nix;
   module-consumedir = ./module-consumedir.nix;