From e96123f7b1c517209c4d0b49ea76463085abe3fb Mon Sep 17 00:00:00 2001 From: Felix Kaechele Date: Sat, 14 Sep 2024 17:28:14 -0400 Subject: [PATCH 1/2] Remove default ubuntu user The Ubuntu 24.04 base image now comes with a default user "ubuntu" that has a uid of 1000. This breaks the ability to use uid 1000 for the BORG_UID environment variable because this uid is now occupied by the default user. Fixes the following log message: ``` usermod: UID '1000' already exists usermod: no changes ``` Signed-off-by: Felix Kaechele --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index cb6e3f1..a42c3ac 100644 --- a/Dockerfile +++ b/Dockerfile @@ -33,6 +33,7 @@ RUN set -x \ libxxhash-dev \ libzstd-dev \ && apt-get autoremove -y --purge \ + && userdel -r ubuntu \ && adduser --uid 500 --disabled-password --gecos "Borg Backup" --quiet borg \ && mkdir -p /var/run/sshd /var/backups/borg /var/lib/docker-borg/ssh mkdir /home/borg/.ssh \ && chown borg.borg /var/backups/borg /home/borg/.ssh \ From 02953ddfde0c83a5af82389c5f4713ee5e593604 Mon Sep 17 00:00:00 2001 From: Felix Kaechele Date: Sat, 14 Sep 2024 17:33:32 -0400 Subject: [PATCH 2/2] Update chown syntax The use of user.group is deprecated. Fixes the following log message: ``` chown: warning: '.' should be ':': 'borg.borg' ``` Signed-off-by: Felix Kaechele --- Dockerfile | 2 +- entrypoint.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index a42c3ac..4929152 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,7 +36,7 @@ RUN set -x \ && userdel -r ubuntu \ && adduser --uid 500 --disabled-password --gecos "Borg Backup" --quiet borg \ && mkdir -p /var/run/sshd /var/backups/borg /var/lib/docker-borg/ssh mkdir /home/borg/.ssh \ - && chown borg.borg /var/backups/borg /home/borg/.ssh \ + && chown borg:borg /var/backups/borg /home/borg/.ssh \ && chmod 700 /home/borg/.ssh \ && rm -rf /var/lib/apt/lists/* diff --git a/entrypoint.sh b/entrypoint.sh index 9e8376b..14041bb 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -24,11 +24,11 @@ fi if [ ! -z ${BORG_AUTHORIZED_KEYS+x} ]; then echo -e "${BORG_AUTHORIZED_KEYS}" > /home/borg/.ssh/authorized_keys - chown borg.borg /home/borg/.ssh/authorized_keys + chown borg:borg /home/borg/.ssh/authorized_keys chmod og-rwx /home/borg/.ssh/authorized_keys fi -chown -R borg.borg /home/borg -chown -R borg.borg /home/borg/.ssh +chown -R borg:borg /home/borg +chown -R borg:borg /home/borg/.ssh exec /usr/sbin/sshd -D -e