From 5ba54fc12a58c01c12b0b4757faeecad907852fe Mon Sep 17 00:00:00 2001 From: Rich Braun Date: Tue, 31 Dec 2024 22:19:18 -0800 Subject: [PATCH 1/2] SYS-633 fix chown commands for ddclient / git-dump --- images/ddclient/entrypoint.sh | 2 +- images/git-dump/Dockerfile | 2 +- images/git-dump/entrypoint.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/images/ddclient/entrypoint.sh b/images/ddclient/entrypoint.sh index cecb8df7..ac33c452 100755 --- a/images/ddclient/entrypoint.sh +++ b/images/ddclient/entrypoint.sh @@ -19,7 +19,7 @@ server=$SERVER, protocol=$SERVICE_TYPE, login=$USER_LOGIN, password=$USER_PASSWO EOF fi chown ddclient.ddclient /etc/ddclient/ddclient.conf -chmod 400 /etc/ddclient/ddclient.conf +chmod 400 /etc/ddclient/ddclient:conf mkdir -p /run/ddclient && chown ddclient /run/ddclient exec su-exec ddclient /usr/bin/ddclient -foreground -verbose diff --git a/images/git-dump/Dockerfile b/images/git-dump/Dockerfile index 123e1f44..2490d8af 100644 --- a/images/git-dump/Dockerfile +++ b/images/git-dump/Dockerfile @@ -9,6 +9,7 @@ LABEL org.opencontainers.image.authors="Rich Braun docker@instantlinux.net" \ org.label-schema.vcs-url=https://github.com/instantlinux/docker-tools ENV API_TOKEN_SECRETNAME= \ DEST_DIR=/var/backup/git \ + GROUP=care \ HOUR=0 MINUTE=45 \ KEEP_DAYS=31 \ ORG= \ @@ -21,7 +22,6 @@ ENV API_TOKEN_SECRETNAME= \ TZ=UTC ARG GIT_VERSION=2.47.1-r0 -ARG GROUP=care ARG GID=505 ARG UID=212 diff --git a/images/git-dump/entrypoint.sh b/images/git-dump/entrypoint.sh index b2a008e9..2f11c60c 100755 --- a/images/git-dump/entrypoint.sh +++ b/images/git-dump/entrypoint.sh @@ -41,7 +41,7 @@ chown -R $USERNAME /home/$USERNAME [ -e /var/log/git-dump.log ] || touch /var/log/git-dump.log [ -e /var/log/git-dump-status.txt ] || touch /var/log/git-dump-status.txt mkdir -p -m 750 $DEST_DIR -chown $USERNAME.$GROUP $DEST_DIR /var/log/git-dump.log /var/log/git-dump-status.txt +chown $USERNAME:$GROUP $DEST_DIR /var/log/git-dump.log /var/log/git-dump-status.txt cat </etc/opt/git-dump # Options for /usr/local/bin/git-dump From 0e346d7e72890c9fb04456daaead840335c1c0c7 Mon Sep 17 00:00:00 2001 From: Rich Braun Date: Tue, 31 Dec 2024 22:23:29 -0800 Subject: [PATCH 2/2] SYS-633 image updates wip --- images/ddclient/entrypoint.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/ddclient/entrypoint.sh b/images/ddclient/entrypoint.sh index ac33c452..6b2fea42 100755 --- a/images/ddclient/entrypoint.sh +++ b/images/ddclient/entrypoint.sh @@ -18,8 +18,8 @@ ssl=yes server=$SERVER, protocol=$SERVICE_TYPE, login=$USER_LOGIN, password=$USER_PASSWORD $HOST EOF fi -chown ddclient.ddclient /etc/ddclient/ddclient.conf -chmod 400 /etc/ddclient/ddclient:conf +chown ddclient:ddclient /etc/ddclient/ddclient.conf +chmod 400 /etc/ddclient/ddclient.conf mkdir -p /run/ddclient && chown ddclient /run/ddclient exec su-exec ddclient /usr/bin/ddclient -foreground -verbose