From 24f12201577653ff811060f469aaa6c1bbbfb570 Mon Sep 17 00:00:00 2001 From: Oksana Salyk Date: Wed, 16 Sep 2026 10:49:41 +0200 Subject: [PATCH 1/4] SRE-3895 build: Replace ARG UID with ARG DAOS_SERVER_UID Signed-off-by: Oksana Salyk Skip-unit-test: true Skip-test: true Skip-func-test: true Skip-func-vm: true Skip-func-hw-test: true --- utils/docker/Dockerfile.el.9 | 8 ++++++-- utils/docker/Dockerfile.leap.15 | 8 ++++++-- utils/docker/Dockerfile.ubuntu | 13 +++++++++---- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/utils/docker/Dockerfile.el.9 b/utils/docker/Dockerfile.el.9 index 44e89745fdc..25b202d43dc 100644 --- a/utils/docker/Dockerfile.el.9 +++ b/utils/docker/Dockerfile.el.9 @@ -84,9 +84,13 @@ RUN --mount=type=bind,source=utils/scripts/install-el9.sh,target=/tmp/daos/insta dnf clean all # Add DAOS user -ARG UID=1000 +ARG DAOS_SERVER_UID RUN --mount=type=bind,source=utils/scripts/helpers/daos-server-user-setup.sh,target=/tmp/daos/daos-server-user-setup.sh \ - /tmp/daos/daos-server-user-setup.sh + if [ -n "${DAOS_SERVER_UID:-}" ]; then \ + UID="${DAOS_SERVER_UID}" /tmp/daos/daos-server-user-setup.sh; \ + else \ + /tmp/daos/daos-server-user-setup.sh; \ + fi # Create directory for DAOS build backend storage RUN mkdir -p /home/daos /opt/daos && \ diff --git a/utils/docker/Dockerfile.leap.15 b/utils/docker/Dockerfile.leap.15 index 621faa8f2d0..81aab0b7c89 100644 --- a/utils/docker/Dockerfile.leap.15 +++ b/utils/docker/Dockerfile.leap.15 @@ -100,9 +100,13 @@ RUN if [ -n "$JENKINS_URL" ]; then \ fi # Add DAOS users -ARG UID=1000 +ARG DAOS_SERVER_UID RUN --mount=type=bind,source=utils/scripts/helpers/daos-server-user-setup.sh,target=/tmp/daos/daos-server-user-setup.sh \ - /tmp/daos/daos-server-user-setup.sh + if [ -n "${DAOS_SERVER_UID:-}" ]; then \ + UID="${DAOS_SERVER_UID}" /tmp/daos/daos-server-user-setup.sh; \ + else \ + /tmp/daos/daos-server-user-setup.sh; \ + fi # Create directory for DAOS build backend storage RUN mkdir -p /home/daos /opt/daos && \ diff --git a/utils/docker/Dockerfile.ubuntu b/utils/docker/Dockerfile.ubuntu index 3a881f40783..36f1a973f8f 100644 --- a/utils/docker/Dockerfile.ubuntu +++ b/utils/docker/Dockerfile.ubuntu @@ -64,12 +64,17 @@ RUN update-alternatives --set \ java /usr/lib/jvm/java-8-openjdk-*/jre/bin/java # Add DAOS users -ARG UID=5000 +ARG DAOS_SERVER_UID COPY ./utils/scripts/helpers/daos-server-user-setup.sh \ /tmp/daos-server-user-setup.sh -RUN set -e; \ - chmod +x /tmp/daos-server-user-setup.sh && \ - /tmp/daos-server-user-setup.sh +RUN set -e; \ + chmod +x /tmp/daos-server-user-setup.sh; \ + if [ -n "${DAOS_SERVER_UID:-}" ]; then \ + UID="${DAOS_SERVER_UID}" \ + /tmp/daos-server-user-setup.sh; \ + else \ + /tmp/daos-server-user-setup.sh; \ + fi RUN useradd --no-log-init --user-group --create-home --shell /bin/bash daos_agent RUN echo "daos_agent:daos_agent" | chpasswd From d1415e74d0e0d1eac2615dfe06986fdaa5a0ab21 Mon Sep 17 00:00:00 2001 From: Oksana Salyk Date: Wed, 16 Sep 2026 11:53:08 +0200 Subject: [PATCH 2/4] Change UID to TARGET_UID Signed-off-by: Oksana Salyk Skip-unit-test: true Skip-test: true Skip-func-test: true Skip-func-vm: true Skip-func-hw-test: true --- utils/docker/Dockerfile.el.9 | 2 +- utils/docker/Dockerfile.leap.15 | 2 +- utils/docker/Dockerfile.ubuntu | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/docker/Dockerfile.el.9 b/utils/docker/Dockerfile.el.9 index 25b202d43dc..76e6285e87d 100644 --- a/utils/docker/Dockerfile.el.9 +++ b/utils/docker/Dockerfile.el.9 @@ -87,7 +87,7 @@ RUN --mount=type=bind,source=utils/scripts/install-el9.sh,target=/tmp/daos/insta ARG DAOS_SERVER_UID RUN --mount=type=bind,source=utils/scripts/helpers/daos-server-user-setup.sh,target=/tmp/daos/daos-server-user-setup.sh \ if [ -n "${DAOS_SERVER_UID:-}" ]; then \ - UID="${DAOS_SERVER_UID}" /tmp/daos/daos-server-user-setup.sh; \ + TARGET_UID="${DAOS_SERVER_UID}" /tmp/daos/daos-server-user-setup.sh; \ else \ /tmp/daos/daos-server-user-setup.sh; \ fi diff --git a/utils/docker/Dockerfile.leap.15 b/utils/docker/Dockerfile.leap.15 index 81aab0b7c89..4dfad941cbc 100644 --- a/utils/docker/Dockerfile.leap.15 +++ b/utils/docker/Dockerfile.leap.15 @@ -103,7 +103,7 @@ RUN if [ -n "$JENKINS_URL" ]; then \ ARG DAOS_SERVER_UID RUN --mount=type=bind,source=utils/scripts/helpers/daos-server-user-setup.sh,target=/tmp/daos/daos-server-user-setup.sh \ if [ -n "${DAOS_SERVER_UID:-}" ]; then \ - UID="${DAOS_SERVER_UID}" /tmp/daos/daos-server-user-setup.sh; \ + TARGET_UID="${DAOS_SERVER_UID}" /tmp/daos/daos-server-user-setup.sh; \ else \ /tmp/daos/daos-server-user-setup.sh; \ fi diff --git a/utils/docker/Dockerfile.ubuntu b/utils/docker/Dockerfile.ubuntu index 36f1a973f8f..208571c1404 100644 --- a/utils/docker/Dockerfile.ubuntu +++ b/utils/docker/Dockerfile.ubuntu @@ -70,7 +70,7 @@ COPY ./utils/scripts/helpers/daos-server-user-setup.sh \ RUN set -e; \ chmod +x /tmp/daos-server-user-setup.sh; \ if [ -n "${DAOS_SERVER_UID:-}" ]; then \ - UID="${DAOS_SERVER_UID}" \ + TARGET_UID="${DAOS_SERVER_UID}" \ /tmp/daos-server-user-setup.sh; \ else \ /tmp/daos-server-user-setup.sh; \ From 2f3d47e0030d4c6b25ed2a62b28b0154f2870af1 Mon Sep 17 00:00:00 2001 From: Oksana Salyk Date: Fri, 18 Sep 2026 08:51:24 +0200 Subject: [PATCH 3/4] Add default value for DAOS_SERVER_UID Signed-off-by: Oksana Salyk Skip-unit-test: true Skip-test: true Skip-func-test: true Skip-func-vm: true Skip-func-hw-test: true --- utils/docker/Dockerfile.el.9 | 6 +----- utils/docker/Dockerfile.leap.15 | 6 +----- utils/docker/Dockerfile.ubuntu | 9 +++------ 3 files changed, 5 insertions(+), 16 deletions(-) diff --git a/utils/docker/Dockerfile.el.9 b/utils/docker/Dockerfile.el.9 index 9399f44f4f3..52f0e7ab210 100644 --- a/utils/docker/Dockerfile.el.9 +++ b/utils/docker/Dockerfile.el.9 @@ -86,11 +86,7 @@ RUN --mount=type=bind,source=utils/scripts/install-el9.sh,target=/tmp/daos/insta # Add DAOS user ARG DAOS_SERVER_UID RUN --mount=type=bind,source=utils/scripts/helpers/daos-server-user-setup.sh,target=/tmp/daos/daos-server-user-setup.sh \ - if [ -n "${DAOS_SERVER_UID:-}" ]; then \ - TARGET_UID="${DAOS_SERVER_UID}" /tmp/daos/daos-server-user-setup.sh; \ - else \ - /tmp/daos/daos-server-user-setup.sh; \ - fi + TARGET_UID="${DAOS_SERVER_UID:-1000}" /tmp/daos/daos-server-user-setup.sh; # Create directory for DAOS build backend storage RUN mkdir -p /home/daos /opt/daos && \ diff --git a/utils/docker/Dockerfile.leap.15 b/utils/docker/Dockerfile.leap.15 index 4dfad941cbc..7db362c09d5 100644 --- a/utils/docker/Dockerfile.leap.15 +++ b/utils/docker/Dockerfile.leap.15 @@ -102,11 +102,7 @@ RUN if [ -n "$JENKINS_URL" ]; then \ # Add DAOS users ARG DAOS_SERVER_UID RUN --mount=type=bind,source=utils/scripts/helpers/daos-server-user-setup.sh,target=/tmp/daos/daos-server-user-setup.sh \ - if [ -n "${DAOS_SERVER_UID:-}" ]; then \ - TARGET_UID="${DAOS_SERVER_UID}" /tmp/daos/daos-server-user-setup.sh; \ - else \ - /tmp/daos/daos-server-user-setup.sh; \ - fi + TARGET_UID="${DAOS_SERVER_UID:-1000}" /tmp/daos/daos-server-user-setup.sh; # Create directory for DAOS build backend storage RUN mkdir -p /home/daos /opt/daos && \ diff --git a/utils/docker/Dockerfile.ubuntu b/utils/docker/Dockerfile.ubuntu index 8c515793d1a..3363af300c2 100644 --- a/utils/docker/Dockerfile.ubuntu +++ b/utils/docker/Dockerfile.ubuntu @@ -69,12 +69,9 @@ COPY ./utils/scripts/helpers/daos-server-user-setup.sh \ /tmp/daos-server-user-setup.sh RUN set -e; \ chmod +x /tmp/daos-server-user-setup.sh; \ - if [ -n "${DAOS_SERVER_UID:-}" ]; then \ - TARGET_UID="${DAOS_SERVER_UID}" \ - /tmp/daos-server-user-setup.sh; \ - else \ - /tmp/daos-server-user-setup.sh; \ - fi + TARGET_UID="${DAOS_SERVER_UID:-5000}" \ + /tmp/daos-server-user-setup.sh; + RUN useradd --no-log-init --user-group --create-home --shell /bin/bash daos_agent RUN echo "daos_agent:daos_agent" | chpasswd From 4405051bc3633d2593566369d16b804543b08efe Mon Sep 17 00:00:00 2001 From: Oksana Salyk Date: Fri, 18 Sep 2026 09:00:49 +0200 Subject: [PATCH 4/4] Change TARGET_UID to UID Signed-off-by: Oksana Salyk Skip-unit-test: true Skip-test: true Skip-func-test: true Skip-func-vm: true Skip-func-hw-test: true --- utils/docker/Dockerfile.el.9 | 2 +- utils/docker/Dockerfile.leap.15 | 2 +- utils/docker/Dockerfile.ubuntu | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/docker/Dockerfile.el.9 b/utils/docker/Dockerfile.el.9 index 52f0e7ab210..41ab0417f73 100644 --- a/utils/docker/Dockerfile.el.9 +++ b/utils/docker/Dockerfile.el.9 @@ -86,7 +86,7 @@ RUN --mount=type=bind,source=utils/scripts/install-el9.sh,target=/tmp/daos/insta # Add DAOS user ARG DAOS_SERVER_UID RUN --mount=type=bind,source=utils/scripts/helpers/daos-server-user-setup.sh,target=/tmp/daos/daos-server-user-setup.sh \ - TARGET_UID="${DAOS_SERVER_UID:-1000}" /tmp/daos/daos-server-user-setup.sh; + UID="${DAOS_SERVER_UID:-1000}" /tmp/daos/daos-server-user-setup.sh; # Create directory for DAOS build backend storage RUN mkdir -p /home/daos /opt/daos && \ diff --git a/utils/docker/Dockerfile.leap.15 b/utils/docker/Dockerfile.leap.15 index 7db362c09d5..f557280cf56 100644 --- a/utils/docker/Dockerfile.leap.15 +++ b/utils/docker/Dockerfile.leap.15 @@ -102,7 +102,7 @@ RUN if [ -n "$JENKINS_URL" ]; then \ # Add DAOS users ARG DAOS_SERVER_UID RUN --mount=type=bind,source=utils/scripts/helpers/daos-server-user-setup.sh,target=/tmp/daos/daos-server-user-setup.sh \ - TARGET_UID="${DAOS_SERVER_UID:-1000}" /tmp/daos/daos-server-user-setup.sh; + UID="${DAOS_SERVER_UID:-1000}" /tmp/daos/daos-server-user-setup.sh; # Create directory for DAOS build backend storage RUN mkdir -p /home/daos /opt/daos && \ diff --git a/utils/docker/Dockerfile.ubuntu b/utils/docker/Dockerfile.ubuntu index 3363af300c2..c7410f38884 100644 --- a/utils/docker/Dockerfile.ubuntu +++ b/utils/docker/Dockerfile.ubuntu @@ -69,7 +69,7 @@ COPY ./utils/scripts/helpers/daos-server-user-setup.sh \ /tmp/daos-server-user-setup.sh RUN set -e; \ chmod +x /tmp/daos-server-user-setup.sh; \ - TARGET_UID="${DAOS_SERVER_UID:-5000}" \ + UID="${DAOS_SERVER_UID:-5000}" \ /tmp/daos-server-user-setup.sh; RUN useradd --no-log-init --user-group --create-home --shell /bin/bash daos_agent