Skip to content

Commit 31014bf

Browse files
[docker] removes workaround for missing crypto-policies-scripts subpackage (#83455)
* Revert "[build] Use 8.2 tag of ubi-minimal (#82688)" This reverts commit a89176e. * chore(NA): remove workaround for missing crypto-policies-scripts subpackage Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
1 parent bc22b67 commit 31014bf

File tree

2 files changed

+1
-8
lines changed

2 files changed

+1
-8
lines changed

src/dev/build/tasks/os_packages/docker_generator/run.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ export async function runDockerGenerator(
4040
ubi: boolean = false
4141
) {
4242
// UBI var config
43-
const baseOSImage = ubi ? 'docker.elastic.co/ubi8/ubi-minimal:8.2' : 'centos:8';
43+
const baseOSImage = ubi ? 'docker.elastic.co/ubi8/ubi-minimal:latest' : 'centos:8';
4444
const ubiVersionTag = 'ubi8';
4545
const ubiImageFlavor = ubi ? `-${ubiVersionTag}` : '';
4646

src/dev/build/tasks/os_packages/docker_generator/templates/Dockerfile

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,16 +46,9 @@ EXPOSE 5601
4646
{{#ubi}}
4747
# https://github.com/rpm-software-management/microdnf/issues/50
4848
RUN mkdir -p /run/user/$(id -u)
49-
50-
# crypto-policies not currently compatible with libnss :sadpanda:
51-
RUN printf "[main]\nexclude=crypto-policies" > /etc/dnf/dnf.conf
5249
{{/ubi}}
5350

5451
RUN for iter in {1..10}; do \
55-
{{#ubi}}
56-
# update microdnf to have exclusion feature for dnf configuration
57-
{{packageManager}} update microdnf --setopt=tsflags=nodocs -y && \
58-
{{/ubi}}
5952
{{packageManager}} update --setopt=tsflags=nodocs -y && \
6053
{{packageManager}} install --setopt=tsflags=nodocs -y \
6154
fontconfig freetype shadow-utils libnss3.so {{#ubi}}findutils{{/ubi}} && \

0 commit comments

Comments
 (0)