TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-04-04 10:29:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update nix/nixos and docker setups

Browse Source
This commit is contained in:
Eike Kettner 2020-06-29 21:01:07 +02:00
parent 8998706598
commit ec7b34ee6f
6 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docker/build-images.sh
View File

@ -5,13 +5,13 @@ set -e
# Update the versions in joex.dockerfile and restserver.dockerfile, # Update the versions in joex.dockerfile and restserver.dockerfile,
# docker-compose.yml and joex/entrypoint.sh; update versions here # 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:joex-0.8.0 -f joex.dockerfile .
docker build -t eikek0/docspell:restserver-0.7.0 -f restserver.dockerfile . docker build -t eikek0/docspell:restserver-0.8.0 -f restserver.dockerfile .
docker build -t eikek0/docspell:consumedir-0.7.0 -f consumedir.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:restserver-0.8.0 eikek0/docspell:restserver-latest
docker tag eikek0/docspell:joex-0.7.0 eikek0/docspell:joex-latest docker tag eikek0/docspell:joex-0.8.0 eikek0/docspell:joex-latest
docker tag eikek0/docspell:consumedir-0.7.0 eikek0/docspell:consumedir-latest docker tag eikek0/docspell:consumedir-0.8.0 eikek0/docspell:consumedir-latest

6
docker/consumedir.dockerfile
View File

@ -6,10 +6,10 @@ RUN apk add --no-cache unzip curl bash inotify-tools
RUN mkdir -p /opt \ RUN mkdir -p /opt \
&& cd /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 \ && unzip docspell.zip \
&& rm docspell.zip \ && rm docspell.zip \
&& apk del unzip \ && 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"]

2
docker/entrypoint-joex.sh
View File

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

2
docker/joex.dockerfile
View File

@ -24,7 +24,7 @@ RUN apk add --no-cache openjdk11-jre \
&& ln -s /usr/bin/python3 /usr/bin/python \ && ln -s /usr/bin/python3 /usr/bin/python \
&& mkdir -p /opt \ && mkdir -p /opt \
&& cd /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 \ && unzip docspell.zip \
&& rm docspell.zip \ && rm docspell.zip \
&& apk del curl unzip && apk del curl unzip

4
docker/restserver.dockerfile
View File

@ -6,11 +6,11 @@ RUN apk add --no-cache openjdk11-jre unzip curl bash
RUN mkdir -p /opt \ RUN mkdir -p /opt \
&& cd /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 \ && unzip docspell.zip \
&& rm docspell.zip \ && rm docspell.zip \
&& apk del unzip curl && apk del unzip curl
EXPOSE 7880 EXPOSE 7880
ENTRYPOINT ["/opt/docspell-restserver-0.7.0/bin/docspell-restserver"] ENTRYPOINT ["/opt/docspell-restserver-0.8.0/bin/docspell-restserver"]

17
nix/release.nix
View File

@ -1,5 +1,20 @@
rec { rec {
cfg = { 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 { v0_7_0 = rec {
version = "0.7.0"; version = "0.7.0";
server = { server = {
@ -107,7 +122,7 @@ rec {
}; };
}; };
pkg = v: import ./pkg.nix v; pkg = v: import ./pkg.nix v;
currentPkg = pkg cfg.v0_7_0; currentPkg = pkg cfg.v0_8_0;
module-joex = ./module-joex.nix; module-joex = ./module-joex.nix;
module-restserver = ./module-server.nix; module-restserver = ./module-server.nix;
module-consumedir = ./module-consumedir.nix; module-consumedir = ./module-consumedir.nix;