From 4cdf5c64f626d5f031e96f1fc9c88d8095bcb7af Mon Sep 17 00:00:00 2001 From: Tiago Costa Date: Wed, 4 Nov 2020 16:58:02 +0000 Subject: [PATCH] chore(NA): install microdnf in UBI docker build only (#82611) * chore(NA): install microdnf in uby docker build only * chore(NA): run microdnf update inside a retry * chore(NA): run microdnf update inside the main retry --- .../tasks/os_packages/docker_generator/templates/Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/dev/build/tasks/os_packages/docker_generator/templates/Dockerfile b/src/dev/build/tasks/os_packages/docker_generator/templates/Dockerfile index c47edfb9cf63d..d17b597eb6648 100644 --- a/src/dev/build/tasks/os_packages/docker_generator/templates/Dockerfile +++ b/src/dev/build/tasks/os_packages/docker_generator/templates/Dockerfile @@ -52,8 +52,10 @@ EXPOSE 5601 {{/ubi}} RUN for iter in {1..10}; do \ - # update microdnf to have exclusion feature for dnf configuration - {{packageManager}} update microdnf --setopt=tsflags=nodocs -y && \ + {{#ubi}} + # update microdnf to have exclusion feature for dnf configuration + {{packageManager}} update microdnf --setopt=tsflags=nodocs -y && \ + {{/ubi}} {{packageManager}} update --setopt=tsflags=nodocs -y && \ {{packageManager}} install --setopt=tsflags=nodocs -y \ fontconfig freetype shadow-utils libnss3.so {{#ubi}}findutils{{/ubi}} && \