Dockerfiles: improve readability of user/group creation logic

Signed-off-by: Yann Dirson <[email protected]> Cc: Simone Conti <[email protected]>
xcp-ng · Nov 10, 2023 · d198d4a · d198d4a
1 parent 2fe411b
commit d198d4a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/Dockerfile-7.x b/Dockerfile-7.x
@@ -48,17 +48,17 @@ RUN     sed -i "/gpgkey/a exclude=ocaml*" /etc/yum.repos.d/Cent* /etc/yum.repos.
 
 # Set up the builder user
 RUN     bash -c ' \
+            OPTS=(); \
             if [ -n "${CUSTOM_BUILDER_UID}" ]; then \
-                if [ -z "${CUSTOM_BUILDER_GID}" ]; then \
-                    CUSTOM_BUILDER_GID="${CUSTOM_BUILDER_UID}"; \
-                fi; \
+                OPTS+=("-u" "${CUSTOM_BUILDER_UID}"); \
+            fi; \
+            if [ -n "${CUSTOM_BUILDER_GID}" ]; then \
+                OPTS+=("-g" "${CUSTOM_BUILDER_GID}"); \
                 if ! getent group "${CUSTOM_BUILDER_GID}" >/dev/null; then \
                     groupadd -g "${CUSTOM_BUILDER_GID}" builder; \
                 fi; \
-                useradd -u "${CUSTOM_BUILDER_UID}" -g "${CUSTOM_BUILDER_GID}" builder; \
-            else \
-                useradd builder; \
             fi; \
+            useradd "${OPTS[@]}" builder; \
         ' \
         && echo "builder:builder" | chpasswd \
         && echo "builder ALL=(ALL:ALL) NOPASSWD: ALL" >> /etc/sudoers \

diff --git a/Dockerfile-8.x b/Dockerfile-8.x
@@ -50,17 +50,17 @@ RUN     sed -i "/gpgkey/a exclude=ocaml*" /etc/yum.repos.d/Cent* /etc/yum.repos.
 
 # Set up the builder user
 RUN     bash -c ' \
+            OPTS=(); \
             if [ -n "${CUSTOM_BUILDER_UID}" ]; then \
-                if [ -z "${CUSTOM_BUILDER_GID}" ]; then \
-                    CUSTOM_BUILDER_GID="${CUSTOM_BUILDER_UID}"; \
-                fi; \
+                OPTS+=("-u" "${CUSTOM_BUILDER_UID}"); \
+            fi; \
+            if [ -n "${CUSTOM_BUILDER_GID}" ]; then \
+                OPTS+=("-g" "${CUSTOM_BUILDER_GID}"); \
                 if ! getent group "${CUSTOM_BUILDER_GID}" >/dev/null; then \
                     groupadd -g "${CUSTOM_BUILDER_GID}" builder; \
                 fi; \
-                useradd -u "${CUSTOM_BUILDER_UID}" -g "${CUSTOM_BUILDER_GID}" builder; \
-            else \
-                useradd builder; \
             fi; \
+            useradd "${OPTS[@]}" builder; \
         ' \
         && echo "builder:builder" | chpasswd \
         && echo "builder ALL=(ALL:ALL) NOPASSWD: ALL" >> /etc/sudoers