TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-06-21 01:48:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update nix and docker setup

Browse Source
This commit is contained in:
Eike Kettner
2020-09-09 22:08:17 +02:00
parent 43f331841f
commit dc88fcb960
6 changed files with 32 additions and 16 deletions
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.11.0 -f joex.dockerfile . docker build -t eikek0/docspell:joex-0.11.1 -f joex.dockerfile .
docker build -t eikek0/docspell:restserver-0.11.0 -f restserver.dockerfile . docker build -t eikek0/docspell:restserver-0.11.1 -f restserver.dockerfile .
docker build -t eikek0/docspell:consumedir-0.11.0 -f consumedir.dockerfile . docker build -t eikek0/docspell:consumedir-0.11.1 -f consumedir.dockerfile .
docker tag eikek0/docspell:restserver-0.11.0 eikek0/docspell:restserver-latest docker tag eikek0/docspell:restserver-0.11.1 eikek0/docspell:restserver-latest
docker tag eikek0/docspell:joex-0.11.0 eikek0/docspell:joex-latest docker tag eikek0/docspell:joex-0.11.1 eikek0/docspell:joex-latest
docker tag eikek0/docspell:consumedir-0.11.0 eikek0/docspell:consumedir-latest docker tag eikek0/docspell:consumedir-0.11.1 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.11.0/docspell-tools-0.11.0.zip \ && curl -L -o docspell.zip https://github.com/eikek/docspell/releases/download/v0.11.1/docspell-tools-0.11.1.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.11.0/*.sh && chmod 755 /opt/docspell-tools-0.11.1/*.sh
ENTRYPOINT ["/opt/docspell-tools-0.11.0/consumedir.sh"] ENTRYPOINT ["/opt/docspell-tools-0.11.1/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.11.0/bin/docspell-joex "$@" /opt/docspell-joex-0.11.1/bin/docspell-joex "$@"

7
docker/joex.dockerfile
View File

@ -25,22 +25,23 @@ RUN apk add --no-cache openjdk11-jre \
zlib-dev \ zlib-dev \
g++ \ g++ \
qpdf \ qpdf \
py3-pip \
python3-dev \ python3-dev \
libffi-dev\ libffi-dev\
qpdf-dev \ qpdf-dev \
openssl-dev \ openssl-dev \
ocrmypdf \ ocrmypdf \
&& ln -s /usr/bin/python3 /usr/bin/python \
&& pip3 install --upgrade pip \ && pip3 install --upgrade pip \
&& pip3 install ocrmypdf \ && pip3 install ocrmypdf \
&& curl -Ls $UNO_URL -o /usr/local/bin/unoconv \ && curl -Ls $UNO_URL -o /usr/local/bin/unoconv \
&& chmod +x /usr/local/bin/unoconv \ && chmod +x /usr/local/bin/unoconv \
&& mkdir -p /opt \ && mkdir -p /opt \
&& cd /opt \ && cd /opt \
&& curl -L -o docspell.zip https://github.com/eikek/docspell/releases/download/v0.11.0/docspell-joex-0.11.0.zip \ && curl -L -o docspell.zip https://github.com/eikek/docspell/releases/download/v0.11.1/docspell-joex-0.11.1.zip \
&& unzip docspell.zip \ && unzip docspell.zip \
&& rm docspell.zip \ && rm docspell.zip \
&& apk del curl unzip libxml2-dev libxslt-dev zlib-dev g++ python3-dev libffi-dev qpdf-dev openssl-dev && apk del curl unzip libxml2-dev libxslt-dev zlib-dev g++ python3-dev py3-pip libffi-dev qpdf-dev openssl-dev
COPY entrypoint-joex.sh /opt/entrypoint.sh COPY entrypoint-joex.sh /opt/entrypoint.sh

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.11.0/docspell-restserver-0.11.0.zip \ && curl -L -o docspell.zip https://github.com/eikek/docspell/releases/download/v0.11.1/docspell-restserver-0.11.1.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.11.0/bin/docspell-restserver"] ENTRYPOINT ["/opt/docspell-restserver-0.11.1/bin/docspell-restserver"]

17
nix/release.nix
View File

@ -1,5 +1,20 @@
rec { rec {
cfg = { cfg = {
v0_11_1 = rec {
version = "0.11.1";
server = {
url = "https://github.com/eikek/docspell/releases/download/v${version}/docspell-restserver-${version}.zip";
sha256 = "16vwk5mbm4jfp3awghwi8mqz7h4garaqk15fx7gsz8yr05c7yzz5";
};
joex = {
url = "https://github.com/eikek/docspell/releases/download/v${version}/docspell-joex-${version}.zip";
sha256 = "1mdk68g0zzp5zlr458z7dsn12y2pni2b9c9262almqs53sza7dqq";
};
tools = {
url = "https://github.com/eikek/docspell/releases/download/v${version}/docspell-tools-${version}.zip";
sha256 = "1ca7jlwjn505f7s1apbi8xi987yqb1hlrivj6gz25c092xc4bv8c";
};
};
v0_11_0 = rec { v0_11_0 = rec {
version = "0.11.0"; version = "0.11.0";
server = { server = {
@ -167,7 +182,7 @@ rec {
}; };
}; };
pkg = v: import ./pkg.nix v; pkg = v: import ./pkg.nix v;
currentPkg = pkg cfg.v0_11_0; currentPkg = pkg cfg.v0_11_1;
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;