Install missing punkt_tab, and use primary.postgres

This commit is contained in:
Daniel Berteaud 2024-09-03 22:25:38 +02:00
parent aadcc63e7d
commit 109ace1714
4 changed files with 13 additions and 11 deletions

View File

@ -110,10 +110,11 @@ RUN set -euxo pipefail &&\
mkdir -p /usr/share/nltk_data &&\
python3 -c "import nltk; nltk.download('stopwords', download_dir='/usr/share/nltk_data')" &&\
python3 -c "import nltk; nltk.download('punkt', download_dir='/usr/share/nltk_data')" &&\
rm -f /usr/share/nltk_data/corpora/stopwords.zip /usr/share/nltk_data/tokenizers/punkt.zip
python3 -c "import nltk; nltk.download('punkt_tab', download_dir='/usr/share/nltk_data')" &&\
rm -f /usr/share/nltk_data/corpora/stopwords.zip /usr/share/nltk_data/tokenizers/punkt.zip /usr/share/nltk_data/tokenizers/punkt_tab.zip
COPY root/ /
COPY --from=danielberteaud/alpine:24.8-4 /usr/local/bin/minit /usr/local/bin/minit
COPY --from=danielberteaud/alpine:24.9-1 /usr/local/bin/minit /usr/local/bin/minit
EXPOSE ${PAPERLESS_PORT}
USER paperless

View File

@ -94,7 +94,7 @@ job "paperless" {
}
env {
SERVICE_0 = "master.postgres.service.consul"
SERVICE_0 = "primary.postgres.service.consul"
}
resources {
@ -120,7 +120,7 @@ job "paperless" {
}
config {
image = "danielberteaud/valkey:24.8-4"
image = "danielberteaud/valkey:24.9-1"
readonly_rootfs = true
pids_limit = 100
command = "valkey-server"
@ -154,7 +154,7 @@ _EOT
driver = "docker"
config {
image = "danielberteaud/paperless-ngx:2.11.6-1"
image = "danielberteaud/paperless-ngx:2.11.6-2"
image_pull_timeout = "10m"
readonly_rootfs = true
pids_limit = 200
@ -237,7 +237,7 @@ _EOT
}
config {
image = "danielberteaud/paperless-ngx:2.11.6-1"
image = "danielberteaud/paperless-ngx:2.11.6-2"
image_pull_timeout = "10m"
readonly_rootfs = true
pids_limit = 100
@ -316,7 +316,7 @@ _EOT
}
config {
image = "danielberteaud/paperless-ngx:2.11.6-1"
image = "danielberteaud/paperless-ngx:2.11.6-2"
image_pull_timeout = "10m"
readonly_rootfs = true
pids_limit = 100
@ -395,7 +395,7 @@ _EOT
}
config {
image = "danielberteaud/paperless-ngx:2.11.6-1"
image = "danielberteaud/paperless-ngx:2.11.6-2"
image_pull_timeout = "10m"
readonly_rootfs = true
pids_limit = 300

View File

@ -110,7 +110,8 @@ RUN set -euxo pipefail &&\
mkdir -p /usr/share/nltk_data &&\
python3 -c "import nltk; nltk.download('stopwords', download_dir='/usr/share/nltk_data')" &&\
python3 -c "import nltk; nltk.download('punkt', download_dir='/usr/share/nltk_data')" &&\
rm -f /usr/share/nltk_data/corpora/stopwords.zip /usr/share/nltk_data/tokenizers/punkt.zip
python3 -c "import nltk; nltk.download('punkt_tab', download_dir='/usr/share/nltk_data')" &&\
rm -f /usr/share/nltk_data/corpora/stopwords.zip /usr/share/nltk_data/tokenizers/punkt.zip /usr/share/nltk_data/tokenizers/punkt_tab.zip
COPY root/ /
COPY --from=[[ .docker.repo ]][[ .docker.base_images.alpine.image ]] /usr/local/bin/minit /usr/local/bin/minit

View File

@ -31,13 +31,13 @@ paperless:
PAPERLESS_CORS_ALLOWED_HOSTS: '[[ .paperless.webserver.public_url ]]'
wait_for:
- service: master.postgres[[ .consul.suffix ]]
- service: primary.postgres[[ .consul.suffix ]]
# This is the main task
webserver:
# The Docker image to use
image: '[[ .docker.repo ]]paperless-ngx:[[ .paperless.version ]]-1'
image: '[[ .docker.repo ]]paperless-ngx:[[ .paperless.version ]]-2'
# Env vars to set in the container
env: {}