From 13daa99933df247a8b6394816d2e66b380d5d69c Mon Sep 17 00:00:00 2001
From: Eike Kettner <eike.kettner@posteo.de>
Date: Mon, 28 Sep 2020 01:10:44 +0200
Subject: [PATCH] Update docker and nix setup
---
docker/build-images.sh | 12 ++++++------
docker/consumedir.dockerfile | 6 +++---
docker/entrypoint-joex.sh | 2 +-
docker/joex.dockerfile | 2 +-
docker/push-images.sh | 6 +++---
docker/restserver.dockerfile | 4 ++--
nix/release.nix | 17 ++++++++++++++++-
7 files changed, 32 insertions(+), 17 deletions(-)
diff --git a/docker/build-images.sh b/docker/build-images.sh
index cbf11571..cd403a57 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.11.1 -f joex.dockerfile .
-docker build -t eikek0/docspell:restserver-0.11.1 -f restserver.dockerfile .
-docker build -t eikek0/docspell:consumedir-0.11.1 -f consumedir.dockerfile .
+docker build -t eikek0/docspell:joex-0.12.0 -f joex.dockerfile .
+docker build -t eikek0/docspell:restserver-0.12.0 -f restserver.dockerfile .
+docker build -t eikek0/docspell:consumedir-0.12.0 -f consumedir.dockerfile .
-docker tag eikek0/docspell:restserver-0.11.1 eikek0/docspell:restserver-latest
-docker tag eikek0/docspell:joex-0.11.1 eikek0/docspell:joex-latest
-docker tag eikek0/docspell:consumedir-0.11.1 eikek0/docspell:consumedir-latest
+docker tag eikek0/docspell:restserver-0.12.0 eikek0/docspell:restserver-latest
+docker tag eikek0/docspell:joex-0.12.0 eikek0/docspell:joex-latest
+docker tag eikek0/docspell:consumedir-0.12.0 eikek0/docspell:consumedir-latest
diff --git a/docker/consumedir.dockerfile b/docker/consumedir.dockerfile
index dad3a840..88dd1af1 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.11.1/docspell-tools-0.11.1.zip \
+ && curl -L -o docspell.zip https://github.com/eikek/docspell/releases/download/v0.12.0/docspell-tools-0.12.0.zip \
&& unzip docspell.zip \
&& rm docspell.zip \
&& apk del unzip \
- && chmod 755 /opt/docspell-tools-0.11.1/*.sh
+ && chmod 755 /opt/docspell-tools-0.12.0/*.sh
-ENTRYPOINT ["/opt/docspell-tools-0.11.1/consumedir.sh"]
+ENTRYPOINT ["/opt/docspell-tools-0.12.0/consumedir.sh"]
diff --git a/docker/entrypoint-joex.sh b/docker/entrypoint-joex.sh
index a351be10..f1d95857 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.11.1/bin/docspell-joex "$@"
+/opt/docspell-joex-0.12.0/bin/docspell-joex "$@"
diff --git a/docker/joex.dockerfile b/docker/joex.dockerfile
index abb2d2a3..aec6d522 100644
--- a/docker/joex.dockerfile
+++ b/docker/joex.dockerfile
@@ -8,7 +8,7 @@ RUN apk add --no-cache openjdk11-jre \
curl \
&& mkdir -p /opt \
&& cd /opt \
- && curl -L -o docspell.zip https://github.com/eikek/docspell/releases/download/v0.11.1/docspell-joex-0.11.1.zip \
+ && curl -L -o docspell.zip https://github.com/eikek/docspell/releases/download/v0.12.0/docspell-joex-0.12.0.zip \
&& unzip docspell.zip \
&& rm docspell.zip \
&& apk del curl unzip
diff --git a/docker/push-images.sh b/docker/push-images.sh
index 9da647f7..ab76dffe 100755
--- a/docker/push-images.sh
+++ b/docker/push-images.sh
@@ -4,9 +4,9 @@ set -e
# Update the versions in joex.dockerfile and restserver.dockerfile,
# docker-compose.yml and joex/entrypoint.sh; update versions here
-docker push eikek0/docspell:joex-0.11.1
-docker push eikek0/docspell:restserver-0.11.1
-docker push eikek0/docspell:consumedir-0.11.1
+docker push eikek0/docspell:joex-0.12.0
+docker push eikek0/docspell:restserver-0.12.0
+docker push eikek0/docspell:consumedir-0.12.0
docker push eikek0/docspell:restserver-latest
docker push eikek0/docspell:joex-latest
diff --git a/docker/restserver.dockerfile b/docker/restserver.dockerfile
index cb9bb1b1..4c2c6dae 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.11.1/docspell-restserver-0.11.1.zip \
+ && curl -L -o docspell.zip https://github.com/eikek/docspell/releases/download/v0.12.0/docspell-restserver-0.12.0.zip \
&& unzip docspell.zip \
&& rm docspell.zip \
&& apk del unzip curl
EXPOSE 7880
-ENTRYPOINT ["/opt/docspell-restserver-0.11.1/bin/docspell-restserver"]
+ENTRYPOINT ["/opt/docspell-restserver-0.12.0/bin/docspell-restserver"]
diff --git a/nix/release.nix b/nix/release.nix
index 1ebb6153..0237fa73 100644
--- a/nix/release.nix
+++ b/nix/release.nix
@@ -1,5 +1,20 @@
rec {
cfg = {
+ v0_12_0 = rec {
+ version = "0.12.0";
+ server = {
+ url = "https://github.com/eikek/docspell/releases/download/v${version}/docspell-restserver-${version}.zip";
+ sha256 = "1wskwlsgbnx8izaflaga00py5abb2kiy2p69ry2j0dbbafnlcgzi";
+ };
+ joex = {
+ url = "https://github.com/eikek/docspell/releases/download/v${version}/docspell-joex-${version}.zip";
+ sha256 = "1ad0wbvb8ssqdvf8w9449bdfva3z2rv2dpk3dcjp9vwl78x01g20";
+ };
+ tools = {
+ url = "https://github.com/eikek/docspell/releases/download/v${version}/docspell-tools-${version}.zip";
+ sha256 = "1nx53imh7jvx9kyfgp1bnc3mdmg5dzm8a4iws8jsbl4dxng46bbc";
+ };
+ };
v0_11_1 = rec {
version = "0.11.1";
server = {
@@ -182,7 +197,7 @@ rec {
};
};
pkg = v: import ./pkg.nix v;
- currentPkg = pkg cfg.v0_11_1;
+ currentPkg = pkg cfg.v0_12_0;
module-joex = ./module-joex.nix;
module-restserver = ./module-server.nix;
module-consumedir = ./module-consumedir.nix;