Merge pull request #58 from linuxserver/3.20

Rebase to 3.20

Author: thespad

Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine:3.19
+FROM ghcr.io/linuxserver/baseimage-alpine:3.20
 
 # set version label
 ARG BUILD_DATE
@@ -47,7 +47,8 @@ RUN \
   pip install -U --no-cache-dir \
     pip \
     wheel && \
-  pip install --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.19/ -r requirements.txt && \
+  pip install --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.20/ -r requirements.txt && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** cleanup ****" && \
   apk del --purge \
     build-dependencies && \

Dockerfile.aarch64

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.19
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20
 
 # set version label
 ARG BUILD_DATE
@@ -47,7 +47,8 @@ RUN \
   pip install -U --no-cache-dir \
     pip \
     wheel && \
-  pip install --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.19/ -r requirements.txt && \
+  pip install --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.20/ -r requirements.txt && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** cleanup ****" && \
   apk del --purge \
     build-dependencies && \

Jenkinsfile

@@ -34,8 +34,8 @@ pipeline {
     CI_PORT='8000'
     CI_SSL='false'
     CI_DELAY='120'
-    CI_DOCKERENV='TZ=US/Pacific'
-    CI_AUTH='user:password'
+    CI_DOCKERENV=''
+    CI_AUTH=''
     CI_WEBPATH=''
   }
   stages {

README.md

@@ -157,7 +157,7 @@ Containers are configured using parameters passed at runtime (such as those abov
 | `-e DB_USER=` | Database user |
 | `-e DB_PASSWORD=` | Database password |
 | `-e DB_HOST=` | Database host (default: postgres) |
-| `-e DB_PORT=` | Database port (defaul: 5432) |
+| `-e DB_PORT=` | Database port (default: 5432) |
 | `-e REDIS_HOST=` | Redis host (default: redis) |
 | `-e REDIS_PORT=` | Redis port number (default: 6379) |
 | `-e REDIS_PASSWORD=` | Redis password (default: none) |
@@ -333,6 +333,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **01.06.24:** - Rebase to Alpine 3.20.
 * **23.12.23:** - Rebase to Alpine 3.19.
 * **11.06.23:** - Rebase to Alpine 3.18, deprecate armhf.
 * **14.05.23:** - Build local docs on first run.

jenkins-vars.yml

@@ -6,7 +6,6 @@ external_type: github_stable
 release_type: stable
 release_tag: latest
 ls_branch: master
-build_armhf: false
 repo_vars:
   - EXT_GIT_BRANCH = 'master'
   - EXT_USER = 'netbox-community'
@@ -25,6 +24,6 @@ repo_vars:
   - CI_PORT='8000'
   - CI_SSL='false'
   - CI_DELAY='120'
-  - CI_DOCKERENV='TZ=US/Pacific'
-  - CI_AUTH='user:password'
+  - CI_DOCKERENV=''
+  - CI_AUTH=''
   - CI_WEBPATH=''

readme-vars.yml

@@ -28,7 +28,7 @@ param_env_vars:
   - { env_var: "DB_USER", env_value: "", desc: "Database user" }
   - { env_var: "DB_PASSWORD", env_value: "", desc: "Database password" }
   - { env_var: "DB_HOST", env_value: "", desc: "Database host (default: postgres)" }
-  - { env_var: "DB_PORT", env_value: "", desc: "Database port (defaul: 5432)" }
+  - { env_var: "DB_PORT", env_value: "", desc: "Database port (default: 5432)" }
   - { env_var: "REDIS_HOST", env_value: "", desc: "Redis host (default: redis)" }
   - { env_var: "REDIS_PORT", env_value: "", desc: "Redis port number (default: 6379)" }
   - { env_var: "REDIS_PASSWORD", env_value: "", desc: "Redis password (default: none)" }
@@ -53,11 +53,12 @@ param_ports:
 app_setup_block_enabled: true
 app_setup_block: |
   Netbox requires a postgres database and a redis instance.
-  
+
   Access the WebUI at <your-ip>:8000. For more information, check out [NetBox](https://github.com/netbox-community/netbox).
 
 # changelog
 changelogs:
+  - { date: "01.06.24:", desc: "Rebase to Alpine 3.20."}
   - { date: "23.12.23:", desc: "Rebase to Alpine 3.19."}
   - { date: "11.06.23:", desc: "Rebase to Alpine 3.18, deprecate armhf." }
   - { date: "14.05.23:", desc: "Build local docs on first run." }