From 54f6cd4cdac41733b91b1ac4744156c8c7dca910 Mon Sep 17 00:00:00 2001 From: thespad Date: Sat, 1 Jun 2024 20:58:06 +0100 Subject: [PATCH 1/2] Rebase to 3.20 --- Dockerfile | 4 ++-- Dockerfile.aarch64 | 4 ++-- Jenkinsfile | 4 ++-- README.md | 3 ++- jenkins-vars.yml | 5 ++--- readme-vars.yml | 5 +++-- 6 files changed, 13 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4d8fd73..97982bb 100644 --- a/Dockerfile +++ b/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,7 @@ 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 && \ echo "**** cleanup ****" && \ apk del --purge \ build-dependencies && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index d4492bf..f9db110 100644 --- a/Dockerfile.aarch64 +++ b/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,7 @@ 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 && \ echo "**** cleanup ****" && \ apk del --purge \ build-dependencies && \ diff --git a/Jenkinsfile b/Jenkinsfile index 7867d98..412fdd3 100644 --- a/Jenkinsfile +++ b/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 { diff --git a/README.md b/README.md index 22d21e6..23d513e 100644 --- a/README.md +++ b/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. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 8292eef..a522e86 100644 --- a/jenkins-vars.yml +++ b/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='' diff --git a/readme-vars.yml b/readme-vars.yml index 5f54b74..7992567 100644 --- a/readme-vars.yml +++ b/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 :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." } From a340174dc732750c2ad73a205841efe8a16c2bc1 Mon Sep 17 00:00:00 2001 From: thespad Date: Sat, 1 Jun 2024 20:59:00 +0100 Subject: [PATCH 2/2] Add build_version output --- Dockerfile | 1 + Dockerfile.aarch64 | 1 + 2 files changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 97982bb..a5443f4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -48,6 +48,7 @@ RUN \ pip \ wheel && \ 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 && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index f9db110..d199553 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -48,6 +48,7 @@ RUN \ pip \ wheel && \ 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 && \