Skip to content

Commit f3c7eb4

Browse files
authored
Merge pull request #2424 from drwetter/fix_utilLinux_Dockerfile
Make sure util_Linux gets replaced as intended
2 parents 6431104 + 781757f commit f3c7eb4

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

Dockerfile

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,20 @@ ARG INSTALL_ROOT=/rootfs
66
FROM opensuse/leap:${LEAP_VERSION} as builder
77
ARG CACHE_ZYPPER=/tmp/cache/zypper
88
ARG INSTALL_ROOT
9-
# /etc/os-release provides $VERSION_ID
9+
10+
11+
# /etc/os-release provides $VERSION_ID below.
12+
# We don't need the openh264.repo and the non-oss repos, just costs build time (repo caches).
13+
# Also we need to remove the util_linux RPM to /really/ make sure busybox-util-linux gets installed.
14+
# And we need to run zypper update, see all PR #2424.
1015
RUN source /etc/os-release \
16+
&& rm -f /etc/zypp/repos.d/repo-openh264.repo /etc/zypp/repos.d/repo-non-oss.repo \
1117
&& export ZYPPER_OPTIONS=( --releasever "${VERSION_ID}" --installroot "${INSTALL_ROOT}" --cache-dir "${CACHE_ZYPPER}" ) \
1218
&& zypper "${ZYPPER_OPTIONS[@]}" --gpg-auto-import-keys refresh \
19+
&& rpm -e util-linux --nodeps \
1320
&& zypper "${ZYPPER_OPTIONS[@]}" --non-interactive install --download-in-advance --no-recommends \
1421
bash procps grep gawk sed coreutils busybox-util-linux busybox-vi ldns libidn2-0 socat openssl curl \
22+
&& zypper up -y \
1523
&& zypper "${ZYPPER_OPTIONS[@]}" clean --all
1624
## Cleanup (reclaim approx 13 MiB):
1725
# None of this content should be relevant to the container:

0 commit comments

Comments
 (0)