Update to 2.1.3

This commit is contained in:
Daniel Berteaud 2023-12-17 20:44:23 +01:00
parent 68e96dccdc
commit 43fb1de138
3 changed files with 16 additions and 16 deletions

View File

@ -2,7 +2,7 @@
FROM python:3.11-alpine AS builder
ARG PAPERLESS_VERSION=2.1.2
ARG PAPERLESS_VERSION=2.1.3
WORKDIR /opt

View File

@ -2,7 +2,7 @@
job "[[ .paperless.instance ]]" {
[[ template "common/job_start.tpl" $c ]]
[[ template "common/job_start" $c ]]
group "paperless" {
network {
@ -33,7 +33,7 @@ job "[[ .paperless.instance ]]" {
name = "[[ .paperless.instance ]][[ .consul.suffix ]]"
port = 8994
[[ template "common/connect.tpl" $c ]]
[[ template "common/connect" $c ]]
[[ $c = merge .paperless.webserver . ]]
tags = [
@ -43,15 +43,15 @@ job "[[ .paperless.instance ]]" {
"[[ $c.traefik.instance ]].http.routers.[[ .paperless.instance ]][[ .consul.suffix ]].entrypoints=[[ join $c.traefik.entrypoints "," ]]",
[[- if not (regexp.Match "^/?$" (urlParse $c.public_url).Path) ]]
"[[ $c.traefik.instance ]].http.middlewares.[[ .paperless.instance ]][[ .consul.suffix ]]-prefix.stripprefix.prefixes=[[ (urlParse .paperless.public_url).Path ]]",
"[[ $c.traefik.instance ]].http.routers.[[ .paperless.instance ]][[ .consul.suffix ]].middlewares=[[ .paperless.instance ]][[ $c.consul.suffix ]]-prefix,[[ template "common/traefik_middlewares.tpl" $c.traefik ]]",
"[[ $c.traefik.instance ]].http.routers.[[ .paperless.instance ]][[ .consul.suffix ]].middlewares=[[ .paperless.instance ]][[ $c.consul.suffix ]]-prefix,[[ template "common/traefik_middlewares" $c.traefik ]]",
[[- else ]]
"[[ $c.traefik.instance ]].http.routers.[[ .paperless.instance ]][[ .consul.suffix ]].middlewares=[[ template "common/traefik_middlewares.tpl" $c.traefik ]]",
"[[ $c.traefik.instance ]].http.routers.[[ .paperless.instance ]][[ .consul.suffix ]].middlewares=[[ template "common/traefik_middlewares" $c.traefik ]]",
[[- end ]]
]
}
[[ template "common/task.wait_for.tpl" merge .paperless . ]]
[[ template "common/task.redis.tpl" ]]
[[ template "common/task.wait_for" merge .paperless . ]]
[[ template "common/task.redis" ]]
task "webserver" {
driver = [[ $c.nomad.driver | toJSON ]]
@ -74,7 +74,7 @@ job "[[ .paperless.instance ]]" {
TMPDIR = "/alloc/tmp"
}
[[ template "common/file_env.tpl" merge $c.env .paperless.env ]]
[[ template "common/file_env" merge $c.env .paperless.env ]]
volume_mount {
volume = "data"
@ -86,7 +86,7 @@ job "[[ .paperless.instance ]]" {
destination = "/input"
}
[[ template "common/resources.tpl" $c.resources ]]
[[ template "common/resources" $c.resources ]]
}
[[- if .paperless.consumer.enabled ]]
@ -116,7 +116,7 @@ job "[[ .paperless.instance ]]" {
TMPDIR = "/alloc/tmp"
}
[[ template "common/file_env.tpl" merge $c.env .paperless.env ]]
[[ template "common/file_env" merge $c.env .paperless.env ]]
volume_mount {
volume = "data"
@ -128,7 +128,7 @@ job "[[ .paperless.instance ]]" {
destination = "/input"
}
[[ template "common/resources.tpl" $c.resources ]]
[[ template "common/resources" $c.resources ]]
}
[[- end ]]
@ -158,7 +158,7 @@ job "[[ .paperless.instance ]]" {
TMPDIR = "/alloc/tmp"
}
[[ template "common/file_env.tpl" merge $c.env .paperless.env ]]
[[ template "common/file_env" merge $c.env .paperless.env ]]
volume_mount {
volume = "data"
@ -170,7 +170,7 @@ job "[[ .paperless.instance ]]" {
destination = "/input"
}
[[ template "common/resources.tpl" $c.resources ]]
[[ template "common/resources" $c.resources ]]
}
[[ $c := merge .paperless.task_queue . ]]
@ -199,7 +199,7 @@ job "[[ .paperless.instance ]]" {
TMPDIR = "/alloc/tmp"
}
[[ template "common/file_env.tpl" merge $c.env .paperless.env ]]
[[ template "common/file_env" merge $c.env .paperless.env ]]
volume_mount {
volume = "data"
@ -211,7 +211,7 @@ job "[[ .paperless.instance ]]" {
destination = "/input"
}
[[ template "common/resources.tpl" $c.resources ]]
[[ template "common/resources" $c.resources ]]
}
}
}

View File

@ -34,7 +34,7 @@ paperless:
webserver:
# The Docker image to use
image: danielberteaud/paperless-ngx:2.1.2-1
image: 'danielberteaud/paperless-ngx:2.1.3-1'
# Env vars to set in the container
env: {}