Merge pull request #47616 from ixdy/debian-base-hold-libcap2

Automatic merge from submit-queue (batch tested with PRs 47451, 47410, 47598, 47616, 47473) debian-base: don't remove libcap2 **What this PR does / why we need it**: when I updated the `debian-base` image earlier this week, it apparently removed the libcap2 libraries needed for some dependent images (e.g. fluentd-gcp, #47600). By holding this package, the library isn't removed from the base image. I've verified by running https://github.com/moul/docker-diff against the `debian-base` image from 2017-02-24. **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: x-ref #47386 **Special notes for your reviewer**: nothing is pushed yet. **Release note**: ```release-note NONE ``` /cc @timstclair @dchen1107 @luxas @kubernetes/sig-release-misc

Merge pull request #47616 from ixdy/debian-base-hold-libcap2
e7bd725d · Kubernetes Submit Queue · GitHub · 7ad835d7 · 2098cb84 · e7bd725d
Commit e7bd725d authored Jun 15, 2017 by Kubernetes Submit Queue Committed by GitHub Jun 15, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

Dockerfile.build build/debian-base/Dockerfile.build +1 -1

No files found.
--- a/build/debian-base/Dockerfile.build
+++ b/build/debian-base/Dockerfile.build
@@ -32,7 +32,7 @@ RUN apt-get update \
    && apt-get dist-upgrade -y
 # Hold required packages to avoid breaking the installation of packages
-RUN apt-mark hold apt gnupg adduser passwd libsemanage1
+RUN apt-mark hold apt gnupg adduser passwd libsemanage1 libcap2
 # Remove unnecessary packages.
 # This list was generated manually by listing the installed packages (`apt list --installed`),