osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/37190?usp=email )
Change subject: debian-bookworm-*: useradd -d -m instead of mkdir ......................................................................
debian-bookworm-*: useradd -d -m instead of mkdir
Shorten the logic for adding the user slightly, as suggested by Vadim in code review.
Change-Id: Ief8837bd9f89f51e66857a453f7fc4645620159f --- M debian-bookworm-build-arm/Dockerfile M debian-bookworm-build/Dockerfile M debian-bookworm-obs-asan/Dockerfile M debian-bookworm-obs-latest/Dockerfile 4 files changed, 20 insertions(+), 12 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/90/37190/1
diff --git a/debian-bookworm-build-arm/Dockerfile b/debian-bookworm-build-arm/Dockerfile index d7e963b..9b725a7 100644 --- a/debian-bookworm-build-arm/Dockerfile +++ b/debian-bookworm-build-arm/Dockerfile @@ -17,9 +17,8 @@ # Configure build user, disable installing man pages # * man pages: without them we avoid waiting for "generating manpages" RUN set -x && \ - useradd --uid=${UID} build && \ - mkdir /build && \ - chown -R build:build /build /usr/local && \ + useradd --uid=${UID} -d /build -m build && \ + chown -R build:build /usr/local && \ \ echo "path-exclude=/usr/share/man/*" \ > /etc/dpkg/dpkg.cfg.d/exclude-man-pages && \ diff --git a/debian-bookworm-build/Dockerfile b/debian-bookworm-build/Dockerfile index edca2d7..952631b 100644 --- a/debian-bookworm-build/Dockerfile +++ b/debian-bookworm-build/Dockerfile @@ -18,9 +18,8 @@ # * /usr/local: osmo-python-tests's contrib/jenkins.sh writes there # * man pages: without them we avoid waiting for "generating manpages" RUN set -x && \ - useradd --uid=${UID} build && \ - mkdir /build && \ - chown -R build:build /build /usr/local && \ + useradd --uid=${UID} -d /build -m build && \ + chown -R build:build /usr/local && \ \ echo "path-exclude=/usr/share/man/*" \ > /etc/dpkg/dpkg.cfg.d/exclude-man-pages && \ diff --git a/debian-bookworm-obs-asan/Dockerfile b/debian-bookworm-obs-asan/Dockerfile index 4922723..370b845 100644 --- a/debian-bookworm-obs-asan/Dockerfile +++ b/debian-bookworm-obs-asan/Dockerfile @@ -16,9 +16,8 @@ # * /usr/local: osmo-python-tests's contrib/jenkins.sh writes there # * man pages: without them we avoid waiting for "generating manpages" RUN set -x && \ - useradd --uid=${UID} build && \ - mkdir /build && \ - chown -R build:build /build /usr/local && \ + useradd --uid=${UID} -d /build -m build && \ + chown -R build:build /usr/local && \ \ echo "path-exclude=/usr/share/man/*" \ > /etc/dpkg/dpkg.cfg.d/exclude-man-pages && \ diff --git a/debian-bookworm-obs-latest/Dockerfile b/debian-bookworm-obs-latest/Dockerfile index 9451902..523afb6 100644 --- a/debian-bookworm-obs-latest/Dockerfile +++ b/debian-bookworm-obs-latest/Dockerfile @@ -16,9 +16,8 @@ # * /usr/local: osmo-python-tests's contrib/jenkins.sh writes there # * man pages: without them we avoid waiting for "generating manpages" RUN set -x && \ - useradd --uid=${UID} build && \ - mkdir /build && \ - chown -R build:build /build /usr/local && \ + useradd --uid=${UID} -d /build -m build && \ + chown -R build:build /usr/local && \ \ echo "path-exclude=/usr/share/man/*" \ > /etc/dpkg/dpkg.cfg.d/exclude-man-pages && \