[docker] removes workaround for missing crypto-policies-scripts subpa…

…ckage (elastic#83455) * Revert "[build] Use 8.2 tag of ubi-minimal (elastic#82688)" This reverts commit a89176e. * chore(NA): remove workaround for missing crypto-policies-scripts subpackage Co-authored-by: Kibana Machine <[email protected]>
mistic · Nov 17, 2020 · 7787bcc · 7787bcc
1 parent f1f7f70
commit 7787bcc
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/src/dev/build/tasks/os_packages/docker_generator/run.ts b/src/dev/build/tasks/os_packages/docker_generator/run.ts
@@ -40,7 +40,7 @@ export async function runDockerGenerator(
   ubi: boolean = false
 ) {
   // UBI var config
-  const baseOSImage = ubi ? 'docker.elastic.co/ubi8/ubi-minimal:8.2' : 'centos:8';
+  const baseOSImage = ubi ? 'docker.elastic.co/ubi8/ubi-minimal:latest' : 'centos:8';
   const ubiVersionTag = 'ubi8';
   const ubiImageFlavor = ubi ? `-${ubiVersionTag}` : '';
 

diff --git a/src/dev/build/tasks/os_packages/docker_generator/templates/Dockerfile b/src/dev/build/tasks/os_packages/docker_generator/templates/Dockerfile
@@ -47,16 +47,9 @@ EXPOSE 5601
 {{#ubi}}
   # https://github.com/rpm-software-management/microdnf/issues/50
   RUN mkdir -p /run/user/$(id -u)
-
-  # crypto-policies not currently compatible with libnss :sadpanda:
-  RUN printf "[main]\nexclude=crypto-policies" >  /etc/dnf/dnf.conf
 {{/ubi}}
 
 RUN for iter in {1..10}; do \
-      {{#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}} && \