From 800f6f8d506708bf835fa1ba7dbcd54163eff2c5 Mon Sep 17 00:00:00 2001 From: thespad Date: Thu, 6 Jun 2024 14:17:37 +0100 Subject: [PATCH] Rebase to 3.20 --- Dockerfile | 8 +++++--- Dockerfile.aarch64 | 8 +++++--- Jenkinsfile | 4 ++-- README.md | 1 + jenkins-vars.yml | 4 ++-- readme-vars.yml | 17 ++--------------- 6 files changed, 17 insertions(+), 25 deletions(-) diff --git a/Dockerfile b/Dockerfile index b00e45d..0fc2eb2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine:3.19 as buildstage +FROM ghcr.io/linuxserver/baseimage-alpine:3.20 as buildstage ############## build stage ############## # package version @@ -87,7 +87,7 @@ RUN \ >> /tmp/znc/packages ############## runtime stage ############## -FROM ghcr.io/linuxserver/baseimage-alpine:3.19 +FROM ghcr.io/linuxserver/baseimage-alpine:3.20 # set version label ARG BUILD_DATE @@ -103,11 +103,13 @@ RUN \ echo "**** install runtime packages ****" && \ RUNTIME_PACKAGES=$(echo $(cat /packages)) && \ apk add -U --update --no-cache \ - ${RUNTIME_PACKAGES} + ${RUNTIME_PACKAGES} && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version # copy local files COPY root/ / # ports and volumes EXPOSE 6501 + VOLUME /config diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 385b3ba..e5c9eb8 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.19 as buildstage +FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20 as buildstage ############## build stage ############## # package version @@ -86,7 +86,7 @@ RUN \ >> /tmp/znc/packages ############## 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 @@ -102,11 +102,13 @@ RUN \ echo "**** install runtime packages ****" && \ RUNTIME_PACKAGES=$(echo $(cat /packages)) && \ apk add -U --update --no-cache \ - ${RUNTIME_PACKAGES} + ${RUNTIME_PACKAGES} && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version # copy local files COPY root/ / # ports and volumes EXPOSE 6501 + VOLUME /config diff --git a/Jenkinsfile b/Jenkinsfile index c229f4a..090115b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -33,8 +33,8 @@ pipeline { CI_PORT='6501' CI_SSL='false' CI_DELAY='30' - 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 71c5ca9..75d7267 100644 --- a/README.md +++ b/README.md @@ -275,6 +275,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **06.06.24:** - Rebase to Alpine 3.20. * **26.03.24:** - Switch back to multi-threaded builds and ignore `-beta` and `-alpha` tags as well as `-rc`. * **22.02.24:** - Update build system for v1.9.0 (use cmake). * **23.12.23:** - Rebase to Alpine 3.19. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index f8a323f..1fb1a58 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -23,6 +23,6 @@ repo_vars: - CI_PORT='6501' - CI_SSL='false' - CI_DELAY='30' - - 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 6ba784a..5941138 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -11,30 +11,16 @@ project_blurb_optional_extras_enabled: false available_architectures: - {arch: "{{ arch_x86_64 }}", tag: "amd64-latest"} - {arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"} -# development version -development_versions: false + # container parameters common_param_env_vars_enabled: true param_container_name: "{{ project_name }}" -param_usage_include_net: false -param_usage_include_env: true -param_env_vars: - - {env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London."} param_usage_include_vols: true param_volumes: - { vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/config", desc: "Persistent config files" } param_usage_include_ports: true param_ports: - {external_port: "6501", internal_port: "6501", port_desc: "Port ZNC listens on."} -param_device_map: false -cap_add_param: false -# optional container parameters -opt_param_usage_include_env: false -opt_param_usage_include_vols: false -opt_param_usage_include_ports: false -opt_param_device_map: false -opt_cap_add_param: false -optional_block_1: false # application setup block app_setup_block_enabled: true app_setup_block: | @@ -45,6 +31,7 @@ app_setup_block: | `change password ASAP.` # changelog changelogs: + - {date: "06.06.24:", desc: "Rebase to Alpine 3.20."} - {date: "26.03.24:", desc: "Switch back to multi-threaded builds and ignore `-beta` and `-alpha` tags as well as `-rc`."} - {date: "22.02.24:", desc: "Update build system for v1.9.0 (use cmake)."} - {date: "23.12.23:", desc: "Rebase to Alpine 3.19."}