Skip to content

SRE-3895 build: Replace ARG UID with ARG DAOS_SERVER_UID #19087

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

Draft
osalyk wants to merge 2 commits into
base: master
Choose a base branch
from
+21 −8
Draft

SRE-3895 build: Replace ARG UID with ARG DAOS_SERVER_UID #19087

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24f1220
SRE-3895 build: Replace ARG UID with ARG DAOS_SERVER_UID
osalyk Sep 16, 2026
d1415e7
Change UID to TARGET_UID
osalyk Sep 16, 2026
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
8 changes: 6 additions & 2 deletions utils/docker/Dockerfile.el.9
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
TARGET_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 && \
Expand Down
8 changes: 6 additions & 2 deletions utils/docker/Dockerfile.leap.15
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
TARGET_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 && \
Expand Down
13 changes: 9 additions & 4 deletions utils/docker/Dockerfile.ubuntu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
TARGET_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

Expand Down
Loading