From 77c1509d56aee6642a46ed9a554e5eead37e0010 Mon Sep 17 00:00:00 2001 From: Mark Lambert Date: Fri, 15 May 2026 07:56:26 -0600 Subject: [PATCH 1/2] Add back home folder information --- Dockerfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3eb1557..17de029 100755 --- a/Dockerfile +++ b/Dockerfile @@ -8,11 +8,15 @@ RUN add-pkg openssh-client rsync fuse python3 py3-pip py3-qt6 zstd-libs lz4-libs ## Buld requirements which are deleted in same transaction so they don't impact image RUN add-pkg --virtual build-dependencies py3-pkgconfig python3-dev py3-virtualenv openssl-dev zstd-dev acl-dev lz4-dev build-base qt6-qtbase-dev fuse-dev fuse3-dev xxhash-dev RUN pip3 install --break-system-packages borgbackup vorta pyfuse3 -RUN del-pkg build-dependencies +RUN del-pkg build-dependencies # Copy the start script and force permissions just in case COPY --chmod=755 rootfs/ / +## Configure user home directory +RUN mkdir -p /config +ENV HOME=/config + # don't run as root ENV USER_ID=10 ENV GROUP_ID=1000 From e66279e03cccb2f7a5f1eee05a93bcfcef490794 Mon Sep 17 00:00:00 2001 From: Mark Lambert Date: Mon, 18 May 2026 06:35:49 -0600 Subject: [PATCH 2/2] Add sed command to set user home dir in passwd file for ssh/borgbackup issue. --- Dockerfile | 6 +----- rootfs/etc/cont-init.d/50-init.sh | 6 ++---- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 17de029..9d06eb4 100755 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ FROM jlesage/baseimage-gui:alpine-3.22-v4 RUN apk upgrade --no-cache RUN add-pkg openssh-client rsync fuse python3 py3-pip py3-qt6 zstd-libs lz4-libs openssl \ qt6-qtbase py3-bcrypt py3-pynacl py3-peewee py3-psutil py3-wheel py3-cryptography fuse3 fuse3-libs \ - mesa-dri-gallium font-croscore py3-platformdirs libxxhash firefox-esr + mesa-dri-gallium font-croscore py3-platformdirs libxxhash firefox-esr ## Buld requirements which are deleted in same transaction so they don't impact image RUN add-pkg --virtual build-dependencies py3-pkgconfig python3-dev py3-virtualenv openssl-dev zstd-dev acl-dev lz4-dev build-base qt6-qtbase-dev fuse-dev fuse3-dev xxhash-dev RUN pip3 install --break-system-packages borgbackup vorta pyfuse3 @@ -13,10 +13,6 @@ RUN del-pkg build-dependencies # Copy the start script and force permissions just in case COPY --chmod=755 rootfs/ / -## Configure user home directory -RUN mkdir -p /config -ENV HOME=/config - # don't run as root ENV USER_ID=10 ENV GROUP_ID=1000 diff --git a/rootfs/etc/cont-init.d/50-init.sh b/rootfs/etc/cont-init.d/50-init.sh index e99cd6f..b151979 100755 --- a/rootfs/etc/cont-init.d/50-init.sh +++ b/rootfs/etc/cont-init.d/50-init.sh @@ -5,8 +5,6 @@ mkdir -p /config/xdg/cache mkdir -p /config/xdg/data mkdir -p /config/.config/autostart +# Configure user home directory +sed -i -r s/app\:\:\([0-9]+\):\([0-9]+\)::[^:]+:\(.+\)/app\:\:\\1\:\\2\:\:\\/config\:\\3/ /etc/passwd - -#ls -al /etc/ -#ls -al /etc/cont-init.d/ -#ls -al /etc/services.d/