Skip to content

Commit

Permalink
Fix --user arg when using empy 4 (#276)
Browse files Browse the repository at this point in the history
Empy 4.1 added support for extension markup @((...)), which makes rocker
fail when using passing the `--user` argument as the snippet uses @(( in
some places.
  • Loading branch information
garyservin authored Mar 29, 2024
1 parent 9774799 commit 4078d22
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/rocker/templates/user_snippet.Dockerfile.em
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ RUN existing_user_by_uid=`getent passwd "@(uid)" | cut -f1 -d: || true` && \
existing_group_by_name=`getent group ${groupinfo%;*} || true`; \
existing_group_by_gid=`getent group ${groupinfo#*;} || true`; \
if [ -z "${existing_group_by_name}" ] && [ -z "${existing_group_by_gid}" ]; then \
groupadd -g "${groupinfo#*;}" "${groupinfo%;*}" && usermod -aG "${groupinfo%;*}" "@(name)" @(('|| (true && echo "user-preserve-group-permissive Enabled, continuing without processing group $groupinfo" )') if user_preserve_groups_permissive else '') || (echo "Failed to add group ${groupinfo%;*}, consider option --user-preserve-group-permissive" && exit 2); \
groupadd -g "${groupinfo#*;}" "${groupinfo%;*}" && usermod -aG "${groupinfo%;*}" "@(name)" @( ('|| (true && echo "user-preserve-group-permissive Enabled, continuing without processing group $groupinfo" )') if user_preserve_groups_permissive else '') || (echo "Failed to add group ${groupinfo%;*}, consider option --user-preserve-group-permissive" && exit 2); \
elif [ "${existing_group_by_name}" = "${existing_group_by_gid}" ]; then \
usermod -aG "${groupinfo%;*}" "@(name)" @(('|| (true && echo "user-preserve-group-permissive Enabled, continuing without processing group $groupinfo" )') if user_preserve_groups_permissive else '') || (echo "Failed to adjust group ${groupinfo%;*}, consider option --user-preserve-group-permissive" && exit 2); \
usermod -aG "${groupinfo%;*}" "@(name)" @( ('|| (true && echo "user-preserve-group-permissive Enabled, continuing without processing group $groupinfo" )') if user_preserve_groups_permissive else '') || (echo "Failed to adjust group ${groupinfo%;*}, consider option --user-preserve-group-permissive" && exit 2); \
fi; \
done && \
@[end if]@
Expand Down

0 comments on commit 4078d22

Please sign in to comment.