Merge pull request #166 from linuxserver/3.20

Rebase to 3.20 (master)
linuxserver · May 31, 2024 · 91c64c1 · 91c64c1
2 parents 8086a7d + 0cf4810
commit 91c64c1
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 15 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -2,7 +2,7 @@
 
 FROM ghcr.io/linuxserver/unrar:latest as unrar
 
-FROM ghcr.io/linuxserver/baseimage-alpine:3.19 as buildstage
+FROM ghcr.io/linuxserver/baseimage-alpine:3.20 as buildstage
 
 # set NZBGET version
 ARG NZBGET_RELEASE
@@ -57,7 +57,7 @@ RUN \
   curl -o /app/nzbget/cacert.pem -L "https://curl.se/ca/cacert.pem"
 
 # Runtime Stage
-FROM ghcr.io/linuxserver/baseimage-alpine:3.19
+FROM ghcr.io/linuxserver/baseimage-alpine:3.20
 
 # set version label
 ARG BUILD_DATE
@@ -72,7 +72,7 @@ RUN \
   echo "**** install packages ****" && \
   apk add --no-cache \
     7zip \
-    boost1.82-json \
+    boost1.84-json \
     libxml2 \
     libxslt \
     openssl \
@@ -82,10 +82,11 @@ RUN \
   pip install -U --no-cache-dir \
     pip \
     wheel && \
-  pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.19/ \
+  pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.20/ \
     apprise \
     pynzb \
     requests && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** cleanup ****" && \
   apk del --purge \
     build-dependencies && \

diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
@@ -2,7 +2,7 @@
 
 FROM ghcr.io/linuxserver/unrar:arm64v8-latest as unrar
 
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.19 as buildstage
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20 as buildstage
 
 # set NZBGET version
 ARG NZBGET_RELEASE
@@ -57,7 +57,7 @@ RUN \
   curl -o /app/nzbget/cacert.pem -L "https://curl.se/ca/cacert.pem"
 
 # Runtime Stage
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.19
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20
 
 # set version label
 ARG BUILD_DATE
@@ -72,7 +72,7 @@ RUN \
   echo "**** install packages ****" && \
   apk add --no-cache \
     7zip \
-    boost1.82-json \
+    boost1.84-json \
     libxml2 \
     libxslt \
     openssl \
@@ -82,10 +82,11 @@ RUN \
   pip install -U --no-cache-dir \
     pip \
     wheel && \
-  pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.19/ \
+  pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.20/ \
     apprise \
     pynzb \
     requests && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** cleanup ****" && \
   apk del --purge \
     build-dependencies && \

diff --git a/README.md b/README.md
@@ -108,7 +108,7 @@ services:
       - NZBGET_PASS=tegbzn6789 #optional
     volumes:
       - /path/to/nzbget/data:/config
-      - /path/to/nzbget/downloads:/downloads #optional
+      - /path/to/downloads:/downloads #optional
     ports:
       - 6789:6789
     restart: unless-stopped
@@ -126,7 +126,7 @@ docker run -d \
   -e NZBGET_PASS=tegbzn6789 `#optional` \
   -p 6789:6789 \
   -v /path/to/nzbget/data:/config \
-  -v /path/to/nzbget/downloads:/downloads `#optional` \
+  -v /path/to/downloads:/downloads `#optional` \
   --restart unless-stopped \
   lscr.io/linuxserver/nzbget:latest
 ```
@@ -307,4 +307,5 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
-* **09.05.24:** - Revive image based on the fork from https://github.com/nzbgetcom/nzbget
+* **31.05.24:** - Rebase to Alpine 3.20.
+* **09.05.24:** - Revive image based on the fork from https://github.com/nzbgetcom/nzbget.
diff --git a/readme-vars.yml b/readme-vars.yml
@@ -25,15 +25,14 @@ param_container_name: "{{ project_name }}"
 param_usage_include_env: true
 param_usage_include_vols: true
 param_volumes:
-  - { vol_path: "/config", vol_host_path: "/path/to/nzbget/data", desc: "Persistent config" }
+  - { vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/data", desc: "Persistent config" }
 opt_param_usage_include_vols: true
 opt_param_volumes:
-  - { vol_path: "/downloads", vol_host_path: "/path/to/nzbget/downloads", desc: "Location of downloads on disk." }
+  - { vol_path: "/downloads", vol_host_path: "/path/to/downloads", desc: "Location of downloads on disk." }
 param_usage_include_ports: true
 param_ports:
   - { external_port: "6789", internal_port: "6789", port_desc: "WebUI" }
 
-
 # optional container parameters
 # optional variables
 opt_param_usage_include_env: true
@@ -66,4 +65,5 @@ app_setup_block: |
 
 # changelog
 changelogs:
-  - { date: "09.05.24:", desc: "Revive image based on the fork from https://github.com/nzbgetcom/nzbget" }
+  - { date: "31.05.24:", desc: "Rebase to Alpine 3.20." }
+  - { date: "09.05.24:", desc: "Revive image based on the fork from https://github.com/nzbgetcom/nzbget." }