From 87c735635e13a3c31e90868cb58ade73edf06d59 Mon Sep 17 00:00:00 2001 From: thespad Date: Thu, 27 Jun 2024 14:43:37 +0100 Subject: [PATCH] Rebase to 3.20 --- Dockerfile | 3 ++- Dockerfile.aarch64 | 3 ++- Jenkinsfile | 6 +++--- README.md | 1 + jenkins-vars.yml | 6 +++--- readme-vars.yml | 20 ++------------------ 6 files changed, 13 insertions(+), 26 deletions(-) diff --git a/Dockerfile b/Dockerfile index 13d8a4c..b2c1b0a 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 @@ -46,6 +46,7 @@ RUN \ ln -s /usr/bin/ddclient.in /usr/bin/ddclient && \ mkdir -p /etc/ddclient/ && \ cp /tmp/ddclient/sample-get-ip-from-fritzbox /etc/ddclient/get-ip-from-fritzbox && \ + 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 df5fd92..e8e906e 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 @@ -46,6 +46,7 @@ RUN \ ln -s /usr/bin/ddclient.in /usr/bin/ddclient && \ mkdir -p /etc/ddclient/ && \ cp /tmp/ddclient/sample-get-ip-from-fritzbox /etc/ddclient/get-ip-from-fritzbox && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ apk del --purge \ build-dependencies && \ diff --git a/Jenkinsfile b/Jenkinsfile index c4d33f2..7cf8ab0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -33,9 +33,9 @@ pipeline { CI_WEB='false' CI_PORT='80' CI_SSL='false' - CI_DELAY='30' - CI_DOCKERENV='TZ=US/Pacific' - CI_AUTH='user:password' + CI_DELAY='120' + CI_DOCKERENV='' + CI_AUTH='' CI_WEBPATH='' } stages { diff --git a/README.md b/README.md index 6465034..e9d538d 100644 --- a/README.md +++ b/README.md @@ -273,6 +273,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **27.06.24:** - Rebase to Alpine 3.20. * **23.12.23:** - Rebase to Alpine 3.19. * **25.08.23:** - Rebase to Alpine 3.18. * **04.07.23:** - Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf) diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 6ebffea..f2b29d0 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -23,7 +23,7 @@ repo_vars: - CI_WEB='false' - CI_PORT='80' - CI_SSL='false' - - CI_DELAY='30' - - CI_DOCKERENV='TZ=US/Pacific' - - CI_AUTH='user:password' + - CI_DELAY='120' + - CI_DOCKERENV='' + - CI_AUTH='' - CI_WEBPATH='' diff --git a/readme-vars.yml b/readme-vars.yml index bda6a4d..d7fb3ec 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -6,33 +6,16 @@ project_url: "https://github.com/ddclient/ddclient" project_logo: "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/ddclient-logo.png" project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}" project_blurb: "[{{ project_name|capitalize }}]({{ project_url }}) is a Perl client used to update dynamic DNS entries for accounts on Dynamic DNS Network Service Provider. It was originally written by Paul Burry and is now mostly by wimpunk. It has the capability to update more than just dyndns and it can fetch your WAN-ipaddress in a few different ways." -project_blurb_optional_extras_enabled: false # supported architectures 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: false -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,7 +28,8 @@ app_setup_block: | ```` # changelog changelogs: - - { date: "23.12.23:", desc: "Rebase to Alpine 3.19."} + - {date: "27.06.24:", desc: "Rebase to Alpine 3.20."} + - {date: "23.12.23:", desc: "Rebase to Alpine 3.19."} - {date: "25.08.23:", desc: "Rebase to Alpine 3.18."} - {date: "04.07.23:", desc: "Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)"} - {date: "13.02.23:", desc: "Rebase to Alpine 3.17, migrate to s6v3."}