Skip to content

Commit e30b558

Browse files
committed
Remove redundant commands
.. see #2420 (comment) As suggested by @polarathene the not needed repos are more elegantly removed, commands for removing util-linux removal and zypper up were redudant and thus squashed. First stage was build manually and it looked fine. This fixes #2439 .
1 parent 6746fa5 commit e30b558

1 file changed

Lines changed: 2 additions & 5 deletions

File tree

Dockerfile

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,13 @@ ARG INSTALL_ROOT
1010

1111
# /etc/os-release provides $VERSION_ID below.
1212
# 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.
13+
1514
RUN source /etc/os-release \
16-
&& rm -f /etc/zypp/repos.d/repo-openh264.repo /etc/zypp/repos.d/repo-non-oss.repo \
15+
&& zypper removerepo repo-openh264 repo-non-oss repo-update-non-oss \
1716
&& export ZYPPER_OPTIONS=( --releasever "${VERSION_ID}" --installroot "${INSTALL_ROOT}" --cache-dir "${CACHE_ZYPPER}" ) \
1817
&& zypper "${ZYPPER_OPTIONS[@]}" --gpg-auto-import-keys refresh \
19-
&& rpm -e util-linux --nodeps \
2018
&& zypper "${ZYPPER_OPTIONS[@]}" --non-interactive install --download-in-advance --no-recommends \
2119
bash procps grep gawk sed coreutils busybox ldns libidn2-0 socat openssl curl \
22-
&& zypper up -y \
2320
&& zypper "${ZYPPER_OPTIONS[@]}" clean --all
2421
## Cleanup (reclaim approx 13 MiB):
2522
# None of this content should be relevant to the container:

0 commit comments

Comments
 (0)