TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-06-05 22:55:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update nix and docker setups

Browse Source
This commit is contained in:
Eike Kettner 2020-05-25 17:52:48 +02:00
parent 9caa074657
commit 0b7cc0ec6b
6 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docker/build-images.sh
View File

@ -5,7 +5,11 @@ 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.5.0 -f joex.dockerfile . docker build -t eikek0/docspell:joex-0.6.0 -f joex.dockerfile .
docker build -t eikek0/docspell:restserver-0.5.0 -f restserver.dockerfile . docker build -t eikek0/docspell:restserver-0.6.0 -f restserver.dockerfile .
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 # test with docker-compose up

4
docker/docker-compose.yml
View File

@ -1,7 +1,7 @@
version: '3.7' version: '3.7'
services: services:
restserver: restserver:
image: eikek0/docspell:restserver-0.5.0 image: eikek0/docspell:restserver-0.6.0
container_name: docspell-restserver container_name: docspell-restserver
command: /opt/docspell.conf command: /opt/docspell.conf
ports: ports:
@ -20,7 +20,7 @@ services:
- POSTGRES_PASSWORD=dbpass - POSTGRES_PASSWORD=dbpass
- POSTGRES_DB=dbname - POSTGRES_DB=dbname
joex: joex:
image: eikek0/docspell:joex-0.5.0 image: eikek0/docspell:joex-0.6.0
container_name: docspell-joex container_name: docspell-joex
command: /opt/docspell.conf command: /opt/docspell.conf
ports: ports:

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.5.0/docspell-joex-0.5.0.zip \ && curl -L -o docspell.zip https://github.com/eikek/docspell/releases/download/v0.6.0/docspell-joex-0.6.0.zip \
&& unzip docspell.zip \ && unzip docspell.zip \
&& rm docspell.zip \ && rm docspell.zip \
&& apk del curl unzip && apk del curl unzip

2
docker/joex/entrypoint.sh
View File

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

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.5.0/docspell-restserver-0.5.0.zip \ && curl -L -o docspell.zip https://github.com/eikek/docspell/releases/download/v0.6.0/docspell-restserver-0.6.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.5.0/bin/docspell-restserver"] ENTRYPOINT ["/opt/docspell-restserver-0.6.0/bin/docspell-restserver"]

17
nix/release.nix
View File

@ -1,5 +1,20 @@
rec { rec {
cfg = { cfg = {
v0_6_0 = rec {
version = "0.6.0";
server = {
url = "https://github.com/eikek/docspell/releases/download/v${version}/docspell-restserver-${version}.zip";
sha256 = "1mh8f1hkhh3gy5bwvzxb2kyr7v169w59448pi67q4d49kffk3wl3";
};
joex = {
url = "https://github.com/eikek/docspell/releases/download/v${version}/docspell-joex-${version}.zip";
sha256 = "0p1jjaz19sajvzf750mav4h47q0a79p8555irbd4hpv3i8fpasnb";
};
tools = {
url = "https://github.com/eikek/docspell/releases/download/v${version}/docspell-tools-${version}.zip";
sha256 = "1yh65crg8hjmmp5ql4k44ipq1aw93qfx2jkc2lbdvi8vza5xaq89";
};
};
v0_5_0 = rec { v0_5_0 = rec {
version = "0.5.0"; version = "0.5.0";
server = { server = {
@ -77,7 +92,7 @@ rec {
}; };
}; };
pkg = v: import ./pkg.nix v; pkg = v: import ./pkg.nix v;
currentPkg = pkg cfg.v0_5_0; currentPkg = pkg cfg.v0_6_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;