Skip to content

Prepare for Jazzy upgrade: Improve .docker/Dockerfile to only create users if not already present #9

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

Open
ulikoehler wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Prepare for Jazzy upgrade: Improve .docker/Dockerfile to only create users if not already present #9

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ccb3df0
Very basic upgrade to jazzy
Jan 11, 2025
0c8577f
Fix issues introduced by jazzy upgrade
Jan 11, 2025
e83b696
add comment
Jan 11, 2025
1f31690
Set image to humble
Feb 2, 2025
5923e24
Update .docker/Dockerfile
ulikoehler Feb 12, 2025
4b00903
Update .docker/Dockerfile
ulikoehler Feb 12, 2025
16c7b1f
Update .docker/Dockerfile
ulikoehler Feb 12, 2025
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
15 changes: 9 additions & 6 deletions .docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,14 @@ ARG USERNAME=user

WORKDIR /workspaces

RUN groupadd --gid $USER_GID $USERNAME \
&& useradd --uid $USER_UID --gid $USER_GID -m $USERNAME \
# Create user/group only of no such user/group exists
RUN (getent group $USER_GID || groupadd --gid $USER_GID $USERNAME) \
&& (getent passwd $USER_UID || useradd --uid $USER_UID --gid $USER_GID -m $USERNAME) \
&& mkdir -p -m 0700 /run/user/"${USER_UID}" \
&& mkdir -p -m 0700 /run/user/"${USER_UID}"/gdm \
&& chown user:user /run/user/"${USER_UID}" \
&& chown user:user /workspaces \
&& chown user:user /run/user/"${USER_UID}"/gdm
&& chown $USER_UID:$USER_GID /run/user/"${USER_UID}" \
&& chown $USER_UID:$USER_GID /workspaces \
&& chown $USER_UID:$USER_GID /run/user/"${USER_UID}"/gdm

RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
Expand All @@ -24,7 +25,9 @@ RUN apt-get update && \

ENV XDG_RUNTIME_DIR=/run/user/"${USER_UID}"

USER $USERNAME
# Specify user by UID & GID so this script doesn't
# depend on the exact username
USER $USER_UID:$USER_GID

RUN echo "source /ros_entrypoint.sh" >>~/.bashrc
ARG MAX_ROS_DOMAIN_ID=232
Expand Down