Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FAST_BUILD] Add support for Docker/Podman in rootless mode #2039

Merged
merged 5 commits into from
Jan 14, 2024
Merged

[FAST_BUILD] Add support for Docker/Podman in rootless mode #2039

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
43a79b4
Add support for Docker/Podman in rootless mode
benz0li Nov 22, 2023
72c6693
Merge branch 'main' into fix-2036
mathbunnyru Dec 5, 2023
af5a987
Merge branch 'main' into fix-2036
mathbunnyru Dec 8, 2023
7eed863
Merge branch 'main' into fix-2036
mathbunnyru Jan 7, 2024
1076ab6
Merge branch 'main' into fix-2036
mathbunnyru Jan 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion images/docker-stacks-foundation/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,13 @@ if [ "$(id -u)" == 0 ]; then
userdel "${NB_USER}"
useradd --no-log-init --home "/home/${NB_USER}" --shell /bin/bash --uid "${NB_UID}" --gid "${NB_GID}" --groups 100 "${NB_USER}"
fi
# Update the home directory if the desired user (NB_USER) is root and the
# desired user id (NB_UID) is 0 and the desired group id (NB_GID) is 0.
if [ "${NB_USER}" = "root" ] && [ "${NB_UID}" = "$(id -u "${NB_USER}")" ] && [ "${NB_GID}" = "$(id -g "${NB_USER}")" ]; then
sed -i "s|/root|/home/root|g" /etc/passwd
# Do not preserve ownership in rootless mode
CP_OPTS="-a --no-preserve=ownership"
fi

# Move or symlink the jovyan home directory to the desired user's home
# directory if it doesn't already exist, and update the current working
Expand All @@ -85,7 +92,8 @@ if [ "$(id -u)" == 0 ]; then
if [[ ! -e "/home/${NB_USER}" ]]; then
_log "Attempting to copy /home/jovyan to /home/${NB_USER}..."
mkdir "/home/${NB_USER}"
if cp -a /home/jovyan/. "/home/${NB_USER}/"; then
# shellcheck disable=SC2086
if cp ${CP_OPTS:--a} /home/jovyan/. "/home/${NB_USER}/"; then
_log "Success!"
else
_log "Failed to copy data from /home/jovyan to /home/${NB_USER}!"
Expand Down