From 5f722d7c960884c3db304817892ebde04cc0bc8b Mon Sep 17 00:00:00 2001 From: thespad Date: Mon, 27 Jan 2025 21:27:24 +0000 Subject: [PATCH] Rebase to 3.21 --- .editorconfig | 0 .github/CONTRIBUTING.md | 0 .github/FUNDING.yml | 0 .github/ISSUE_TEMPLATE/config.yml | 0 .github/ISSUE_TEMPLATE/issue.bug.yml | 0 .github/ISSUE_TEMPLATE/issue.feature.yml | 0 .github/workflows/call_issue_pr_tracker.yml | 0 .github/workflows/call_issues_cron.yml | 0 .github/workflows/external_trigger.yml | 0 .github/workflows/external_trigger_scheduler.yml | 0 .github/workflows/greetings.yml | 0 .github/workflows/package_trigger_scheduler.yml | 0 Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- LICENSE | 0 README.md | 1 + readme-vars.yml | 2 ++ root/app/duck.sh | 5 +++-- root/{app => defaults}/logrotate.conf | 0 root/etc/s6-overlay/s6-rc.d/init-duckdns/run | 5 +++++ 20 files changed, 13 insertions(+), 4 deletions(-) mode change 100755 => 100644 .editorconfig mode change 100755 => 100644 .github/CONTRIBUTING.md mode change 100755 => 100644 .github/FUNDING.yml mode change 100755 => 100644 .github/ISSUE_TEMPLATE/config.yml mode change 100755 => 100644 .github/ISSUE_TEMPLATE/issue.bug.yml mode change 100755 => 100644 .github/ISSUE_TEMPLATE/issue.feature.yml mode change 100755 => 100644 .github/workflows/call_issue_pr_tracker.yml mode change 100755 => 100644 .github/workflows/call_issues_cron.yml mode change 100755 => 100644 .github/workflows/external_trigger.yml mode change 100755 => 100644 .github/workflows/external_trigger_scheduler.yml mode change 100755 => 100644 .github/workflows/greetings.yml mode change 100755 => 100644 .github/workflows/package_trigger_scheduler.yml mode change 100755 => 100644 LICENSE rename root/{app => defaults}/logrotate.conf (100%) diff --git a/.editorconfig b/.editorconfig old mode 100755 new mode 100644 diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md old mode 100755 new mode 100644 diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml old mode 100755 new mode 100644 diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml old mode 100755 new mode 100644 diff --git a/.github/ISSUE_TEMPLATE/issue.bug.yml b/.github/ISSUE_TEMPLATE/issue.bug.yml old mode 100755 new mode 100644 diff --git a/.github/ISSUE_TEMPLATE/issue.feature.yml b/.github/ISSUE_TEMPLATE/issue.feature.yml old mode 100755 new mode 100644 diff --git a/.github/workflows/call_issue_pr_tracker.yml b/.github/workflows/call_issue_pr_tracker.yml old mode 100755 new mode 100644 diff --git a/.github/workflows/call_issues_cron.yml b/.github/workflows/call_issues_cron.yml old mode 100755 new mode 100644 diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml old mode 100755 new mode 100644 diff --git a/.github/workflows/external_trigger_scheduler.yml b/.github/workflows/external_trigger_scheduler.yml old mode 100755 new mode 100644 diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml old mode 100755 new mode 100644 diff --git a/.github/workflows/package_trigger_scheduler.yml b/.github/workflows/package_trigger_scheduler.yml old mode 100755 new mode 100644 diff --git a/Dockerfile b/Dockerfile index b2bd7c9..db1c8c6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine:3.20 +FROM ghcr.io/linuxserver/baseimage-alpine:3.21 # set version label ARG BUILD_DATE diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 1b69891..b162433 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20 +FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.21 # set version label ARG BUILD_DATE diff --git a/LICENSE b/LICENSE old mode 100755 new mode 100644 diff --git a/README.md b/README.md index 683e94b..95cb075 100644 --- a/README.md +++ b/README.md @@ -302,6 +302,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **27.01.25:** - Rebase to Alpine 3.21. * **24.06.24:** - Rebase to Alpine 3.20. * **17.06.24:** - Bump CI_DELAY to 120 seconds as ARM builds were failing. * **30.03.24:** - Added IP address to logging output when IP changes. diff --git a/readme-vars.yml b/readme-vars.yml index de015b0..51d57b1 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -30,6 +30,7 @@ opt_param_usage_include_vols: true opt_param_volumes: - {vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/config", desc: "Persistent config files. Also set `LOG_FILE=true` to keep address history."} readonly_supported: true +nonroot_supported: false # application setup block app_setup_block_enabled: true app_setup_block: | @@ -86,6 +87,7 @@ init_diagram: | "duckdns:latest" <- Base Images # changelog changelogs: + - {date: "27.01.25:", desc: "Rebase to Alpine 3.21."} - {date: "24.06.24:", desc: "Rebase to Alpine 3.20."} - {date: "17.06.24:", desc: "Bump CI_DELAY to 120 seconds as ARM builds were failing."} - {date: "30.03.24:", desc: "Added IP address to logging output when IP changes."} diff --git a/root/app/duck.sh b/root/app/duck.sh index ec80f38..9cd5978 100755 --- a/root/app/duck.sh +++ b/root/app/duck.sh @@ -5,7 +5,8 @@ if [[ "${LOG_FILE,,}" = "true" ]]; then DUCK_LOG="/config/duck.log" touch "${DUCK_LOG}" touch /config/logrotate.status - /usr/sbin/logrotate -s /config/logrotate.status /app/logrotate.conf + chmod 640 /config/logrotate.status + /usr/sbin/logrotate -s /config/logrotate.status /config/logrotate.conf else DUCK_LOG="/dev/null" fi @@ -47,7 +48,7 @@ fi elif [[ "${IPV4}" == "" ]] && [[ "${IPV6}" != "" ]]; then echo "Your IP was updated at $(date) to IPv6: ${IPV6}" else - echo "Your IP was updated at $(date) to IPv4: ${IPV4} & IPv6 to: {$IPV6}" + echo "Your IP was updated at $(date) to IPv4: ${IPV4} & IPv6 to: {$IPV6}" fi elif [[ "${RESPONSE}" = "OK" ]] && [[ "${IPCHANGE}" = "NOCHANGE" ]]; then echo "DuckDNS request at $(date) successful. IP(s) unchanged." diff --git a/root/app/logrotate.conf b/root/defaults/logrotate.conf similarity index 100% rename from root/app/logrotate.conf rename to root/defaults/logrotate.conf diff --git a/root/etc/s6-overlay/s6-rc.d/init-duckdns/run b/root/etc/s6-overlay/s6-rc.d/init-duckdns/run index eeaccec..4ff26cd 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-duckdns/run +++ b/root/etc/s6-overlay/s6-rc.d/init-duckdns/run @@ -7,6 +7,11 @@ if [ -z "${SUBDOMAINS}" ] || [ -z "${TOKEN}" ]; then sleep infinity fi +if [[ ! -f /config/logrotate.conf ]]; then + cp /defaults/logrotate.conf /config/logrotate.conf + chmod 640 /config/logrotate.conf +fi + # permissions lsiown -R abc:abc \ /config