Merge pull request #52 from linuxserver/3.16

Rebase duckdns to 3.16 and s6v3

Author: aptalca

Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:3.15
+FROM ghcr.io/linuxserver/baseimage-alpine:3.16
 
 # set version label
 ARG BUILD_DATE
@@ -7,9 +7,6 @@ ARG DUCKDNS_VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="aptalca"
 
-# environment settings
-ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2
-
 RUN \
   echo "**** install packages ****" && \
   apk add --no-cache \

Dockerfile.aarch64

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.15
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.16
 
 # set version label
 ARG BUILD_DATE
@@ -7,9 +7,6 @@ ARG DUCKDNS_VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="aptalca"
 
-# environment settings
-ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2
-
 RUN \
   echo "**** install packages ****" && \
   apk add --no-cache \

Dockerfile.armhf

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.15
+FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.16
 
 # set version label
 ARG BUILD_DATE
@@ -7,9 +7,6 @@ ARG DUCKDNS_VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="aptalca"
 
-# environment settings
-ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2
-
 RUN \
   echo "**** install packages ****" && \
   apk add --no-cache \

README.md

@@ -230,6 +230,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **23.09.22:** - Rebase to alpine 3.16 and s6v3.
 * **19.09.22:** - Rebase to alpine 3.15.
 * **17.05.22:** - Don't allow insecure connections and add timeout.
 * **17.05.22:** - Add random jitter to update time.

readme-vars.yml

@@ -64,6 +64,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "23.09.22:", desc: "Rebase to alpine 3.16 and s6v3." }
   - { date: "19.09.22:", desc: "Rebase to alpine 3.15." }
   - { date: "17.05.22:", desc: "Don't allow insecure connections and add timeout." }
   - { date: "17.05.22:", desc: "Add random jitter to update time." }

root/etc/cont-init.d/40-config

@@ -0,0 +1,27 @@
+#!/usr/bin/with-contenv bash
+
+#Check to make sure the subdomain and token are set
+if [ -z "$SUBDOMAINS" ] || [ -z "$TOKEN" ]; then
+    echo "Please pass both your subdomain(s) and token as environment variables in your docker run command. See the readme for more details."
+    sleep infinity
+else
+    echo "Retrieving subdomain and token from the environment variables"
+    echo -e "SUBDOMAINS=\"${SUBDOMAINS}\" TOKEN=\"${TOKEN}\"" > /app/duck.conf
+fi
+
+# modify crontab if logging to file
+if [ "$LOG_FILE" = "true" ]; then
+    crontab -u abc /defaults/duckcron
+    echo "log will be output to file"
+else
+    echo "log will be output to docker log"
+fi
+
+# permissions
+chown -R abc:abc \
+    /app \
+    /config
+
+# run initial IP update
+exec \
+    s6-setuidgid abc /app/duck.sh

root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-duckdns

@@ -0,0 +1 @@
+oneshot

root/etc/s6-overlay/s6-rc.d/init-duckdns/dependencies.d/init-config

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-duckdns/run

root/etc/s6-overlay/s6-rc.d/init-duckdns/run

@@ -0,0 +1,4 @@
+#!/usr/bin/with-contenv bash
+
+exec \
+    /usr/sbin/crond -f -S -l 0 -c /etc/crontabs

root/etc/s6-overlay/s6-rc.d/init-duckdns/type

@@ -0,0 +1 @@
+longrun