Skip to content

Commit d557450

Browse files
authored
check for user and group existence before adding for BusyBox images (#326)
1 parent 7a2d0cf commit d557450

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

imagetool/src/main/resources/docker-files/create-user-group.mustache

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,13 @@
55
#
66
# Create user and group
77
{{^usingBusybox}}
8-
RUN if [ -z "$(getent group {{groupid}})" ]; then hash groupadd &> /dev/null && groupadd {{groupid}} || exit -1 ; fi \
9-
&& if [ -z "$(getent passwd {{userid}})" ]; then hash useradd &> /dev/null && useradd -g {{groupid}} {{userid}} || exit -1; fi \
10-
&& mkdir -p /u01 \
11-
&& chown {{userid}}:{{groupid}} /u01 \
12-
&& chmod 775 /u01
8+
RUN if [ -z "$(getent group {{groupid}})" ]; then groupadd {{groupid}} || exit -1 ; fi \
9+
&& if [ -z "$(getent passwd {{userid}})" ]; then useradd -g {{groupid}} {{userid}} || exit -1; fi \
10+
&& mkdir -p /u01 \
11+
&& chown {{userid}}:{{groupid}} /u01 \
12+
&& chmod 775 /u01
1313
{{/usingBusybox}}
1414
{{#usingBusybox}}
15-
RUN addgroup {{groupid}} && adduser -D -G {{groupid}} {{userid}}
15+
RUN if [ -z "$(grep ^{{groupid}}: /etc/group)" ]; then addgroup {{groupid}} || exit -1 ; fi \
16+
&& if [ -z "$(grep ^{{userid}}: /etc/passwd)" ]; then adduser -D -G {{groupid}} {{userid}} || exit -1 ; fi
1617
{{/usingBusybox}}

0 commit comments

Comments
 (0)