From 88c183473cd24a70a89e3a18aeb91e4c8cf92f75 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <dbd@ehtrace.com>
Date: Mon, 8 Apr 2024 21:52:00 +0200
Subject: [PATCH] Update to 2.7.2

---
 example/images/paperless-ngx/Dockerfile |  8 ++++----
 example/paperless-ngx.nomad.hcl         | 10 +++++-----
 images/paperless-ngx/Dockerfile         |  4 ++--
 variables.yml                           |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/example/images/paperless-ngx/Dockerfile b/example/images/paperless-ngx/Dockerfile
index 7cb1710..4ac5f9d 100644
--- a/example/images/paperless-ngx/Dockerfile
+++ b/example/images/paperless-ngx/Dockerfile
@@ -2,10 +2,11 @@
 
 FROM python:3.11-alpine AS builder
 
-ARG PAPERLESS_VERSION=2.6.3
+ARG PAPERLESS_VERSION=2.7.2
 
 WORKDIR /opt
 
+ADD https://github.com/paperless-ngx/paperless-ngx/releases/download/v${PAPERLESS_VERSION}/paperless-ngx-v${PAPERLESS_VERSION}.tar.xz /opt
 RUN set -euxo pipefail &&\
     apk --no-cache add \
       git \
@@ -26,9 +27,8 @@ RUN set -euxo pipefail &&\
       ca-certificates \
       rdfind \
     &&\
-    curl -sSLO https://github.com/paperless-ngx/paperless-ngx/releases/download/v${PAPERLESS_VERSION}/paperless-ngx-v${PAPERLESS_VERSION}.tar.xz &&\
     tar xvJf paperless-ngx-v${PAPERLESS_VERSION}.tar.xz &&\
-    rm paperless-ngx-v${PAPERLESS_VERSION}.tar.xz &&\
+    rm -f paperless-ngx-v${PAPERLESS_VERSION}.tar.xz &&\
     mv paperless-ngx paperless &&\
     cd paperless &&\
     python3 -m venv venv &&\
@@ -115,7 +115,7 @@ RUN set -euxo pipefail &&\
     chown paperless:paperless /data /input
 
 COPY root/ /
-COPY --from=danielberteaud/alpine:24.3-1 /usr/local/bin/minit /usr/local/bin/minit
+COPY --from=danielberteaud/alpine:24.4-1 /usr/local/bin/minit /usr/local/bin/minit
 
 EXPOSE ${PAPERLESS_PORT}
 USER paperless
diff --git a/example/paperless-ngx.nomad.hcl b/example/paperless-ngx.nomad.hcl
index 03fdb3e..39b9d8e 100644
--- a/example/paperless-ngx.nomad.hcl
+++ b/example/paperless-ngx.nomad.hcl
@@ -81,7 +81,7 @@ job "paperless" {
       user   = 1053
 
       config {
-        image           = "danielberteaud/wait-for:24.3-1"
+        image           = "danielberteaud/wait-for:24.4-1"
         readonly_rootfs = true
         pids_limit      = 20
       }
@@ -144,7 +144,7 @@ _EOT
       driver = "docker"
 
       config {
-        image              = "danielberteaud/paperless-ngx:2.6.3-1"
+        image              = "danielberteaud/paperless-ngx:2.7.2-1"
         image_pull_timeout = "10m"
         readonly_rootfs    = true
         pids_limit         = 200
@@ -226,7 +226,7 @@ _EOT
       }
 
       config {
-        image              = "danielberteaud/paperless-ngx:2.6.3-1"
+        image              = "danielberteaud/paperless-ngx:2.7.2-1"
         image_pull_timeout = "10m"
         readonly_rootfs    = true
         pids_limit         = 100
@@ -304,7 +304,7 @@ _EOT
       }
 
       config {
-        image              = "danielberteaud/paperless-ngx:2.6.3-1"
+        image              = "danielberteaud/paperless-ngx:2.7.2-1"
         image_pull_timeout = "10m"
         readonly_rootfs    = true
         pids_limit         = 100
@@ -382,7 +382,7 @@ _EOT
       }
 
       config {
-        image              = "danielberteaud/paperless-ngx:2.6.3-1"
+        image              = "danielberteaud/paperless-ngx:2.7.2-1"
         image_pull_timeout = "10m"
         readonly_rootfs    = true
         pids_limit         = 300
diff --git a/images/paperless-ngx/Dockerfile b/images/paperless-ngx/Dockerfile
index 6a24467..523de39 100644
--- a/images/paperless-ngx/Dockerfile
+++ b/images/paperless-ngx/Dockerfile
@@ -6,6 +6,7 @@ ARG PAPERLESS_VERSION=[[ .paperless.version ]]
 
 WORKDIR /opt
 
+ADD https://github.com/paperless-ngx/paperless-ngx/releases/download/v${PAPERLESS_VERSION}/paperless-ngx-v${PAPERLESS_VERSION}.tar.xz /opt
 RUN set -euxo pipefail &&\
     apk --no-cache add \
       git \
@@ -26,9 +27,8 @@ RUN set -euxo pipefail &&\
       ca-certificates \
       rdfind \
     &&\
-    curl -sSLO https://github.com/paperless-ngx/paperless-ngx/releases/download/v${PAPERLESS_VERSION}/paperless-ngx-v${PAPERLESS_VERSION}.tar.xz &&\
     tar xvJf paperless-ngx-v${PAPERLESS_VERSION}.tar.xz &&\
-    rm paperless-ngx-v${PAPERLESS_VERSION}.tar.xz &&\
+    rm -f paperless-ngx-v${PAPERLESS_VERSION}.tar.xz &&\
     mv paperless-ngx paperless &&\
     cd paperless &&\
     python3 -m venv venv &&\
diff --git a/variables.yml b/variables.yml
index 067960c..0ff7566 100644
--- a/variables.yml
+++ b/variables.yml
@@ -6,7 +6,7 @@ instance: paperless
 paperless:
 
   # Version to use
-  version: 2.6.3
+  version: 2.7.2
 
   # Connect to the postgres service through the mesh
   consul: