From 7020dbe200497e20901a5af67a61f8dffba26d91 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Mon, 27 Jun 2022 14:35:20 -0700 Subject: [PATCH] Add --setopt=skip_missing_names_on_install=False to "yum install" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See https://unix.stackexchange.com/a/477127/153467 for details 🙈 --- 10.0/jdk11/corretto/Dockerfile | 4 ++-- 10.0/jdk17/corretto/Dockerfile | 4 ++-- 10.0/jdk8/corretto/Dockerfile | 4 ++-- 10.1/jdk11/corretto/Dockerfile | 4 ++-- 10.1/jdk17/corretto/Dockerfile | 4 ++-- 8.5/jdk11/corretto/Dockerfile | 4 ++-- 8.5/jdk17/corretto/Dockerfile | 4 ++-- 8.5/jdk8/corretto/Dockerfile | 4 ++-- 9.0/jdk11/corretto/Dockerfile | 4 ++-- 9.0/jdk17/corretto/Dockerfile | 4 ++-- 9.0/jdk8/corretto/Dockerfile | 4 ++-- Dockerfile.template | 6 +++--- 12 files changed, 25 insertions(+), 25 deletions(-) diff --git a/10.0/jdk11/corretto/Dockerfile b/10.0/jdk11/corretto/Dockerfile index 5e3a846b1..5331284c2 100644 --- a/10.0/jdk11/corretto/Dockerfile +++ b/10.0/jdk11/corretto/Dockerfile @@ -27,7 +27,7 @@ RUN set -eux; \ \ # http://yum.baseurl.org/wiki/YumDB.html if ! command -v yumdb > /dev/null; then \ - yum install -y yum-utils; \ + yum install -y --setopt=skip_missing_names_on_install=False yum-utils; \ yumdb set reason dep yum-utils; \ fi; \ # a helper function to "yum install" things, but only if they aren't installed (and to set their "reason" to "dep" so "yum autoremove" can purge them for us) @@ -40,7 +40,7 @@ RUN set -eux; \ done; \ if [ -n "$todo" ]; then \ set -x; \ - yum install -y $todo; \ + yum install -y --setopt=skip_missing_names_on_install=False $todo; \ yumdb set reason dep $todo; \ fi; \ ) }; \ diff --git a/10.0/jdk17/corretto/Dockerfile b/10.0/jdk17/corretto/Dockerfile index 50d5361fc..676ce2193 100644 --- a/10.0/jdk17/corretto/Dockerfile +++ b/10.0/jdk17/corretto/Dockerfile @@ -27,7 +27,7 @@ RUN set -eux; \ \ # http://yum.baseurl.org/wiki/YumDB.html if ! command -v yumdb > /dev/null; then \ - yum install -y yum-utils; \ + yum install -y --setopt=skip_missing_names_on_install=False yum-utils; \ yumdb set reason dep yum-utils; \ fi; \ # a helper function to "yum install" things, but only if they aren't installed (and to set their "reason" to "dep" so "yum autoremove" can purge them for us) @@ -40,7 +40,7 @@ RUN set -eux; \ done; \ if [ -n "$todo" ]; then \ set -x; \ - yum install -y $todo; \ + yum install -y --setopt=skip_missing_names_on_install=False $todo; \ yumdb set reason dep $todo; \ fi; \ ) }; \ diff --git a/10.0/jdk8/corretto/Dockerfile b/10.0/jdk8/corretto/Dockerfile index a27b7dd5d..388b0d057 100644 --- a/10.0/jdk8/corretto/Dockerfile +++ b/10.0/jdk8/corretto/Dockerfile @@ -27,7 +27,7 @@ RUN set -eux; \ \ # http://yum.baseurl.org/wiki/YumDB.html if ! command -v yumdb > /dev/null; then \ - yum install -y yum-utils; \ + yum install -y --setopt=skip_missing_names_on_install=False yum-utils; \ yumdb set reason dep yum-utils; \ fi; \ # a helper function to "yum install" things, but only if they aren't installed (and to set their "reason" to "dep" so "yum autoremove" can purge them for us) @@ -40,7 +40,7 @@ RUN set -eux; \ done; \ if [ -n "$todo" ]; then \ set -x; \ - yum install -y $todo; \ + yum install -y --setopt=skip_missing_names_on_install=False $todo; \ yumdb set reason dep $todo; \ fi; \ ) }; \ diff --git a/10.1/jdk11/corretto/Dockerfile b/10.1/jdk11/corretto/Dockerfile index cd5a45e42..2500a6161 100644 --- a/10.1/jdk11/corretto/Dockerfile +++ b/10.1/jdk11/corretto/Dockerfile @@ -27,7 +27,7 @@ RUN set -eux; \ \ # http://yum.baseurl.org/wiki/YumDB.html if ! command -v yumdb > /dev/null; then \ - yum install -y yum-utils; \ + yum install -y --setopt=skip_missing_names_on_install=False yum-utils; \ yumdb set reason dep yum-utils; \ fi; \ # a helper function to "yum install" things, but only if they aren't installed (and to set their "reason" to "dep" so "yum autoremove" can purge them for us) @@ -40,7 +40,7 @@ RUN set -eux; \ done; \ if [ -n "$todo" ]; then \ set -x; \ - yum install -y $todo; \ + yum install -y --setopt=skip_missing_names_on_install=False $todo; \ yumdb set reason dep $todo; \ fi; \ ) }; \ diff --git a/10.1/jdk17/corretto/Dockerfile b/10.1/jdk17/corretto/Dockerfile index 10abaeb0d..9ff24de6d 100644 --- a/10.1/jdk17/corretto/Dockerfile +++ b/10.1/jdk17/corretto/Dockerfile @@ -27,7 +27,7 @@ RUN set -eux; \ \ # http://yum.baseurl.org/wiki/YumDB.html if ! command -v yumdb > /dev/null; then \ - yum install -y yum-utils; \ + yum install -y --setopt=skip_missing_names_on_install=False yum-utils; \ yumdb set reason dep yum-utils; \ fi; \ # a helper function to "yum install" things, but only if they aren't installed (and to set their "reason" to "dep" so "yum autoremove" can purge them for us) @@ -40,7 +40,7 @@ RUN set -eux; \ done; \ if [ -n "$todo" ]; then \ set -x; \ - yum install -y $todo; \ + yum install -y --setopt=skip_missing_names_on_install=False $todo; \ yumdb set reason dep $todo; \ fi; \ ) }; \ diff --git a/8.5/jdk11/corretto/Dockerfile b/8.5/jdk11/corretto/Dockerfile index 5fb02b83a..4dac36177 100644 --- a/8.5/jdk11/corretto/Dockerfile +++ b/8.5/jdk11/corretto/Dockerfile @@ -27,7 +27,7 @@ RUN set -eux; \ \ # http://yum.baseurl.org/wiki/YumDB.html if ! command -v yumdb > /dev/null; then \ - yum install -y yum-utils; \ + yum install -y --setopt=skip_missing_names_on_install=False yum-utils; \ yumdb set reason dep yum-utils; \ fi; \ # a helper function to "yum install" things, but only if they aren't installed (and to set their "reason" to "dep" so "yum autoremove" can purge them for us) @@ -40,7 +40,7 @@ RUN set -eux; \ done; \ if [ -n "$todo" ]; then \ set -x; \ - yum install -y $todo; \ + yum install -y --setopt=skip_missing_names_on_install=False $todo; \ yumdb set reason dep $todo; \ fi; \ ) }; \ diff --git a/8.5/jdk17/corretto/Dockerfile b/8.5/jdk17/corretto/Dockerfile index c77e44e34..7cc53e26c 100644 --- a/8.5/jdk17/corretto/Dockerfile +++ b/8.5/jdk17/corretto/Dockerfile @@ -27,7 +27,7 @@ RUN set -eux; \ \ # http://yum.baseurl.org/wiki/YumDB.html if ! command -v yumdb > /dev/null; then \ - yum install -y yum-utils; \ + yum install -y --setopt=skip_missing_names_on_install=False yum-utils; \ yumdb set reason dep yum-utils; \ fi; \ # a helper function to "yum install" things, but only if they aren't installed (and to set their "reason" to "dep" so "yum autoremove" can purge them for us) @@ -40,7 +40,7 @@ RUN set -eux; \ done; \ if [ -n "$todo" ]; then \ set -x; \ - yum install -y $todo; \ + yum install -y --setopt=skip_missing_names_on_install=False $todo; \ yumdb set reason dep $todo; \ fi; \ ) }; \ diff --git a/8.5/jdk8/corretto/Dockerfile b/8.5/jdk8/corretto/Dockerfile index c5b9545ef..5695879b1 100644 --- a/8.5/jdk8/corretto/Dockerfile +++ b/8.5/jdk8/corretto/Dockerfile @@ -27,7 +27,7 @@ RUN set -eux; \ \ # http://yum.baseurl.org/wiki/YumDB.html if ! command -v yumdb > /dev/null; then \ - yum install -y yum-utils; \ + yum install -y --setopt=skip_missing_names_on_install=False yum-utils; \ yumdb set reason dep yum-utils; \ fi; \ # a helper function to "yum install" things, but only if they aren't installed (and to set their "reason" to "dep" so "yum autoremove" can purge them for us) @@ -40,7 +40,7 @@ RUN set -eux; \ done; \ if [ -n "$todo" ]; then \ set -x; \ - yum install -y $todo; \ + yum install -y --setopt=skip_missing_names_on_install=False $todo; \ yumdb set reason dep $todo; \ fi; \ ) }; \ diff --git a/9.0/jdk11/corretto/Dockerfile b/9.0/jdk11/corretto/Dockerfile index 9b2956175..0e90ff135 100644 --- a/9.0/jdk11/corretto/Dockerfile +++ b/9.0/jdk11/corretto/Dockerfile @@ -27,7 +27,7 @@ RUN set -eux; \ \ # http://yum.baseurl.org/wiki/YumDB.html if ! command -v yumdb > /dev/null; then \ - yum install -y yum-utils; \ + yum install -y --setopt=skip_missing_names_on_install=False yum-utils; \ yumdb set reason dep yum-utils; \ fi; \ # a helper function to "yum install" things, but only if they aren't installed (and to set their "reason" to "dep" so "yum autoremove" can purge them for us) @@ -40,7 +40,7 @@ RUN set -eux; \ done; \ if [ -n "$todo" ]; then \ set -x; \ - yum install -y $todo; \ + yum install -y --setopt=skip_missing_names_on_install=False $todo; \ yumdb set reason dep $todo; \ fi; \ ) }; \ diff --git a/9.0/jdk17/corretto/Dockerfile b/9.0/jdk17/corretto/Dockerfile index 4f15557a6..21649c3d4 100644 --- a/9.0/jdk17/corretto/Dockerfile +++ b/9.0/jdk17/corretto/Dockerfile @@ -27,7 +27,7 @@ RUN set -eux; \ \ # http://yum.baseurl.org/wiki/YumDB.html if ! command -v yumdb > /dev/null; then \ - yum install -y yum-utils; \ + yum install -y --setopt=skip_missing_names_on_install=False yum-utils; \ yumdb set reason dep yum-utils; \ fi; \ # a helper function to "yum install" things, but only if they aren't installed (and to set their "reason" to "dep" so "yum autoremove" can purge them for us) @@ -40,7 +40,7 @@ RUN set -eux; \ done; \ if [ -n "$todo" ]; then \ set -x; \ - yum install -y $todo; \ + yum install -y --setopt=skip_missing_names_on_install=False $todo; \ yumdb set reason dep $todo; \ fi; \ ) }; \ diff --git a/9.0/jdk8/corretto/Dockerfile b/9.0/jdk8/corretto/Dockerfile index a8bede7ff..046421487 100644 --- a/9.0/jdk8/corretto/Dockerfile +++ b/9.0/jdk8/corretto/Dockerfile @@ -27,7 +27,7 @@ RUN set -eux; \ \ # http://yum.baseurl.org/wiki/YumDB.html if ! command -v yumdb > /dev/null; then \ - yum install -y yum-utils; \ + yum install -y --setopt=skip_missing_names_on_install=False yum-utils; \ yumdb set reason dep yum-utils; \ fi; \ # a helper function to "yum install" things, but only if they aren't installed (and to set their "reason" to "dep" so "yum autoremove" can purge them for us) @@ -40,7 +40,7 @@ RUN set -eux; \ done; \ if [ -n "$todo" ]; then \ set -x; \ - yum install -y $todo; \ + yum install -y --setopt=skip_missing_names_on_install=False $todo; \ yumdb set reason dep $todo; \ fi; \ ) }; \ diff --git a/Dockerfile.template b/Dockerfile.template index 14d2d32d7..881b2e6ae 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -96,7 +96,7 @@ RUN set -eux; \ {{ ) else ( -}} # http://yum.baseurl.org/wiki/YumDB.html if ! command -v yumdb > /dev/null; then \ - yum install -y yum-utils; \ + yum install -y --setopt=skip_missing_names_on_install=False yum-utils; \ yumdb set reason dep yum-utils; \ fi; \ # a helper function to "yum install" things, but only if they aren't installed (and to set their "reason" to "dep" so "yum autoremove" can purge them for us) @@ -109,7 +109,7 @@ RUN set -eux; \ done; \ if [ -n "$todo" ]; then \ set -x; \ - yum install -y $todo; \ + yum install -y --setopt=skip_missing_names_on_install=False $todo; \ yumdb set reason dep $todo; \ fi; \ ) }; \ @@ -256,7 +256,7 @@ RUN set -eux; \ xargs -rt apt-get install -y --no-install-recommends < "$TOMCAT_NATIVE_LIBDIR/.dependencies.txt"; \ rm -rf /var/lib/apt/lists/* {{ ) else ( -}} - xargs -rt yum install -y < "$TOMCAT_NATIVE_LIBDIR/.dependencies.txt"; \ + xargs -rt yum install -y --setopt=skip_missing_names_on_install=False < "$TOMCAT_NATIVE_LIBDIR/.dependencies.txt"; \ yum clean all; \ rm -rf /var/cache/yum {{ ) end -}}