Merge pull request #726 from javipolo/ilab-auth

RHELAI-787: Mount auth.json into ilab container
containers · Aug 5, 2024 · cc2447e · cc2447e
2 parents 701564e + 20d7d9a
commit cc2447e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/training/ilab-wrapper/ilab b/training/ilab-wrapper/ilab
@@ -42,6 +42,15 @@ for PODMAN_MOUNT in "${ADDITIONAL_MOUNTS[@]}"; do
     ADDITIONAL_MOUNT_OPTIONS+=("-v" "$PODMAN_MOUNT")
 done
 
+# Add pull-secret to additional mounts
+# In case of normal user, $XDG_RUNTIME_DIR is used
+if [[ -f ${XDG_RUNTIME_DIR}/containers/auth.json ]]; then
+    ADDITIONAL_MOUNT_OPTIONS+=("-v" "${XDG_RUNTIME_DIR}/containers/auth.json:/run/containers/0/auth.json")
+# For root the main /run/containers is used
+elif [[ -f /run/containers/${UID}/auth.json ]]; then
+    ADDITIONAL_MOUNT_OPTIONS+=("-v" "/run/containers/${UID}/auth.json:/run/containers/0/auth.json")
+fi
+
 # We run the container as sudo in order to be able to access the root container
 # storage, which has the ilab image pre-pulled. But for security reasons we map
 # root UID 0 inside the container to the current user's UID (and all the other

diff --git a/training/nvidia-bootc/duplicated/ilab-wrapper/ilab b/training/nvidia-bootc/duplicated/ilab-wrapper/ilab
@@ -42,6 +42,15 @@ for PODMAN_MOUNT in "${ADDITIONAL_MOUNTS[@]}"; do
     ADDITIONAL_MOUNT_OPTIONS+=("-v" "$PODMAN_MOUNT")
 done
 
+# Add pull-secret to additional mounts
+# In case of normal user, $XDG_RUNTIME_DIR is used
+if [[ -f ${XDG_RUNTIME_DIR}/containers/auth.json ]]; then
+    ADDITIONAL_MOUNT_OPTIONS+=("-v" "${XDG_RUNTIME_DIR}/containers/auth.json:/run/containers/0/auth.json")
+# For root the main /run/containers is used
+elif [[ -f /run/containers/${UID}/auth.json ]]; then
+    ADDITIONAL_MOUNT_OPTIONS+=("-v" "/run/containers/${UID}/auth.json:/run/containers/0/auth.json")
+fi
+
 # We run the container as sudo in order to be able to access the root container
 # storage, which has the ilab image pre-pulled. But for security reasons we map
 # root UID 0 inside the container to the current user's UID (and all the other