TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-04-02 09:05:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update nix and docker setups

Browse Source
This commit is contained in:
Eike Kettner 2020-08-15 00:34:33 +02:00
parent f2fbf20f00
commit d68d076c84
6 changed files with 32 additions and 16 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.9.0 -f joex.dockerfile . docker build -t eikek0/docspell:joex-0.10.0 -f joex.dockerfile .
docker build -t eikek0/docspell:restserver-0.9.0 -f restserver.dockerfile . docker build -t eikek0/docspell:restserver-0.10.0 -f restserver.dockerfile .
docker build -t eikek0/docspell:consumedir-0.9.0 -f consumedir.dockerfile . docker build -t eikek0/docspell:consumedir-0.10.0 -f consumedir.dockerfile .
docker tag eikek0/docspell:restserver-0.9.0 eikek0/docspell:restserver-latest docker tag eikek0/docspell:restserver-0.10.0 eikek0/docspell:restserver-latest
docker tag eikek0/docspell:joex-0.9.0 eikek0/docspell:joex-latest docker tag eikek0/docspell:joex-0.10.0 eikek0/docspell:joex-latest
docker tag eikek0/docspell:consumedir-0.9.0 eikek0/docspell:consumedir-latest docker tag eikek0/docspell:consumedir-0.10.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.9.0/docspell-tools-0.9.0.zip \ && curl -L -o docspell.zip https://github.com/eikek/docspell/releases/download/v0.10.0/docspell-tools-0.10.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.9.0/*.sh && chmod 755 /opt/docspell-tools-0.10.0/*.sh
ENTRYPOINT ["/opt/docspell-tools-0.9.0/consumedir.sh"] ENTRYPOINT ["/opt/docspell-tools-0.10.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.9.0/bin/docspell-joex "$@" /opt/docspell-joex-0.10.0/bin/docspell-joex "$@"

7
docker/joex.dockerfile
View File

@ -29,14 +29,15 @@ RUN apk add --no-cache openjdk11-jre \
libffi-dev\ libffi-dev\
qpdf-dev \ qpdf-dev \
openssl-dev \ openssl-dev \
ocrmypdf \
&& ln -s /usr/bin/python3 /usr/bin/python \
&& pip3 install --upgrade pip \ && pip3 install --upgrade pip \
&& pip3 install pdfminer.six==20200517 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 \
&& 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.9.0/docspell-joex-0.9.0.zip \ && curl -L -o docspell.zip https://github.com/eikek/docspell/releases/download/v0.10.0/docspell-joex-0.10.0.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 libffi-dev qpdf-dev openssl-dev

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.9.0/docspell-restserver-0.9.0.zip \ && curl -L -o docspell.zip https://github.com/eikek/docspell/releases/download/v0.10.0/docspell-restserver-0.10.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.9.0/bin/docspell-restserver"] ENTRYPOINT ["/opt/docspell-restserver-0.10.0/bin/docspell-restserver"]

17
nix/release.nix
View File

@ -1,5 +1,20 @@
rec { rec {
cfg = { cfg = {
v0_10_0 = rec {
version = "0.10.0";
server = {
url = "https://github.com/eikek/docspell/releases/download/v${version}/docspell-restserver-${version}.zip";
sha256 = "0md3xqy1qbw8hg6n90i7w5n6nzqipqg9cmc9qypyvmwmxcfpr569";
};
joex = {
url = "https://github.com/eikek/docspell/releases/download/v${version}/docspell-joex-${version}.zip";
sha256 = "1ahc3y0m0gn6s38bddy7sq28ssg5qw57sm456rihv3ms9llwpniq";
};
tools = {
url = "https://github.com/eikek/docspell/releases/download/v${version}/docspell-tools-${version}.zip";
sha256 = "1kd15p5dj4ksfp6ky5xn8c1axdcrp2iplagz3s7p4jzikr3x8rw0";
};
};
v0_9_0 = rec { v0_9_0 = rec {
version = "0.9.0"; version = "0.9.0";
server = { server = {
@ -137,7 +152,7 @@ rec {
}; };
}; };
pkg = v: import ./pkg.nix v; pkg = v: import ./pkg.nix v;
currentPkg = pkg cfg.v0_9_0; currentPkg = pkg cfg.v0_10_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;