From 650f81ccf642b729914e9dda85b0dc262972da66 Mon Sep 17 00:00:00 2001 From: cgruver Date: Tue, 10 Dec 2024 17:37:27 +0000 Subject: [PATCH 1/3] Fix home directory ownership so that podman 5 does not error Signed-off-by: cgruver --- base/ubi9/Dockerfile | 5 ----- base/ubi9/entrypoint.sh | 7 +++++++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/base/ubi9/Dockerfile b/base/ubi9/Dockerfile index 4da4e9bc..7b25150b 100644 --- a/base/ubi9/Dockerfile +++ b/base/ubi9/Dockerfile @@ -117,11 +117,6 @@ RUN mkdir -p /var/lib/shared/overlay-images /var/lib/shared/overlay-layers; \ touch /var/lib/shared/overlay-images/images.lock; \ touch /var/lib/shared/overlay-layers/layers.lock -# But use VFS since not all environments support overlay with Fuse backend -RUN mkdir -p "${HOME}"/.config/containers && \ - (echo '[storage]';echo 'driver = "vfs"') > "${HOME}"/.config/containers/storage.conf && \ - chown -R 10001 "${HOME}"/.config - # Add kubedock ENV KUBEDOCK_VERSION 0.17.0 ENV KUBECONFIG=/home/user/.kube/config diff --git a/base/ubi9/entrypoint.sh b/base/ubi9/entrypoint.sh index aec8312f..45362cc1 100644 --- a/base/ubi9/entrypoint.sh +++ b/base/ubi9/entrypoint.sh @@ -5,6 +5,13 @@ if [ ! -d "${HOME}" ]; then mkdir -p "${HOME}" fi +# Configure container builds to use vfs +if [ ! -d "${HOME}/.config/containers" ] +then + mkdir -p ${HOME}/.config/containers + (echo '[storage]';echo 'driver = "vfs"') > "${HOME}"/.config/containers/storage.conf +fi + # Setup $PS1 for a consistent and reasonable prompt if [ -w "${HOME}" ] && [ ! -f "${HOME}"/.bashrc ]; then echo "PS1='[\u@\h \W]\$ '" > "${HOME}"/.bashrc From e104fb2c6b1d1add07a0c8d1bf3c587233cde514 Mon Sep 17 00:00:00 2001 From: cgruver Date: Tue, 10 Dec 2024 19:19:21 +0000 Subject: [PATCH 2/3] add logic to detect fuse-overlayfs support Signed-off-by: cgruver --- base/ubi9/entrypoint.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/base/ubi9/entrypoint.sh b/base/ubi9/entrypoint.sh index 45362cc1..452e2083 100644 --- a/base/ubi9/entrypoint.sh +++ b/base/ubi9/entrypoint.sh @@ -5,11 +5,16 @@ if [ ! -d "${HOME}" ]; then mkdir -p "${HOME}" fi -# Configure container builds to use vfs +# Configure container builds to use vfs or fuse-overlayfs if [ ! -d "${HOME}/.config/containers" ] then mkdir -p ${HOME}/.config/containers - (echo '[storage]';echo 'driver = "vfs"') > "${HOME}"/.config/containers/storage.conf + if [ -c "/dev/fuse" ] && [ -f "/usr/bin/fuse-overlayfs" ] + then + (echo '[storage]';echo 'driver = "overlay"';echo '[storage.options.overlay]';echo 'mount_program = "/usr/bin/fuse-overlayfs"') > ${HOME}/.config/containers/storage.conf + else + (echo '[storage]';echo 'driver = "vfs"') > "${HOME}"/.config/containers/storage.conf + fi fi # Setup $PS1 for a consistent and reasonable prompt From fa6ea3f90d47a8484ffae602e6915036473fc315 Mon Sep 17 00:00:00 2001 From: cgruver Date: Wed, 11 Dec 2024 11:55:25 +0000 Subject: [PATCH 3/3] update formatting to match Signed-off-by: cgruver --- base/ubi9/entrypoint.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/base/ubi9/entrypoint.sh b/base/ubi9/entrypoint.sh index 452e2083..0754ce5a 100644 --- a/base/ubi9/entrypoint.sh +++ b/base/ubi9/entrypoint.sh @@ -6,11 +6,9 @@ if [ ! -d "${HOME}" ]; then fi # Configure container builds to use vfs or fuse-overlayfs -if [ ! -d "${HOME}/.config/containers" ] -then +if [ ! -d "${HOME}/.config/containers" ]; then mkdir -p ${HOME}/.config/containers - if [ -c "/dev/fuse" ] && [ -f "/usr/bin/fuse-overlayfs" ] - then + if [ -c "/dev/fuse" ] && [ -f "/usr/bin/fuse-overlayfs" ]; then (echo '[storage]';echo 'driver = "overlay"';echo '[storage.options.overlay]';echo 'mount_program = "/usr/bin/fuse-overlayfs"') > ${HOME}/.config/containers/storage.conf else (echo '[storage]';echo 'driver = "vfs"') > "${HOME}"/.config/containers/storage.conf