aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver Smith <osmith@sysmocom.de>2024-04-05 13:43:46 +0200
committerosmith <osmith@sysmocom.de>2024-04-05 14:28:16 +0000
commitbf643370307cdc5e2df193dbea16db003d6543a8 (patch)
treeee114e6a42c6c60089ba91e38976a9be69bf1ce3
parent59ca7d5f3ee8173a8077d0774b7f2add05ad8b16 (diff)
debian-bookworm-obs-latest: add build user
Copy the block for configuring the build user and disabling man pages from debian-bookworm-build. This fixes failures on ttcn3-ggsn-test-kernel-latest* (non-latest worked fine since these use containers based on debian-bookworm-build). Fixes: 5a48bfbe ("scripts/kernel-test: build initrd+kernel as user") Change-Id: Idee29d5b9796e8905bdf822d076f25612cbc77a0
-rw-r--r--debian-bookworm-obs-latest/Dockerfile13
1 files changed, 13 insertions, 0 deletions
diff --git a/debian-bookworm-obs-latest/Dockerfile b/debian-bookworm-obs-latest/Dockerfile
index cd44fcc..9451902 100644
--- a/debian-bookworm-obs-latest/Dockerfile
+++ b/debian-bookworm-obs-latest/Dockerfile
@@ -6,11 +6,24 @@ FROM ${REGISTRY}/${UPSTREAM_DISTRO}
ARG OSMOCOM_REPO_MIRROR="https://downloads.osmocom.org"
ARG OSMOCOM_REPO_PATH="packages/osmocom:"
ARG OSMOCOM_REPO="${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/latest/Debian_12/"
+ARG UID
# Copy from common dir
COPY .common/respawn.sh /usr/local/bin/respawn.sh
COPY .common/Release.key /usr/share/keyrings/osmocom-latest.asc
+# Configure build user, disable installing man pages
+# * /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 && \
+ \
+ echo "path-exclude=/usr/share/man/*" \
+ > /etc/dpkg/dpkg.cfg.d/exclude-man-pages && \
+ rm -rf /usr/share/man/
+
# Configure Osmocom latest repository, add telnet for debugging
RUN set -x && \
apt-get update && \