From 557750673ebb589e47dd21629292d07253b49784 Mon Sep 17 00:00:00 2001 From: Will Szumski Date: Tue, 28 May 2024 17:30:38 +0100 Subject: [PATCH] Upgrade curl-minimal for RHEL based images built from containers Similar rationale to: https://github.com/openstack/diskimage-builder/commit/5f3b7cd7b78616a1d3966d0b63f1b3fed0f1fd91 Where curl-minimal causes dependency conflicts. Hit this particular issue using Ironic Python Agent builder. Change-Id: I84ef52c15288a7254f067076d39496698eef49ec --- .../elements/almalinux-container/containerfiles/8 | 3 ++- .../elements/almalinux-container/containerfiles/9 | 3 ++- diskimage_builder/elements/rocky-container/containerfiles/8 | 2 +- diskimage_builder/elements/rocky-container/containerfiles/9 | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/diskimage_builder/elements/almalinux-container/containerfiles/8 b/diskimage_builder/elements/almalinux-container/containerfiles/8 index ea895b6d6..803ba8d6d 100644 --- a/diskimage_builder/elements/almalinux-container/containerfiles/8 +++ b/diskimage_builder/elements/almalinux-container/containerfiles/8 @@ -1,7 +1,8 @@ FROM quay.io/almalinuxorg/almalinux:8 RUN dnf group install -y 'Minimal Install' --allowerasing && \ - dnf install -y findutils util-linux sudo python3 NetworkManager + dnf install -y findutils util-linux sudo python3 NetworkManager \ + curl libcurl --allowerasing RUN systemctl unmask console-getty.service dev-hugepages.mount \ getty.target sys-fs-fuse-connections.mount systemd-logind.service \ diff --git a/diskimage_builder/elements/almalinux-container/containerfiles/9 b/diskimage_builder/elements/almalinux-container/containerfiles/9 index 342bb94f1..14d53b8e2 100644 --- a/diskimage_builder/elements/almalinux-container/containerfiles/9 +++ b/diskimage_builder/elements/almalinux-container/containerfiles/9 @@ -1,7 +1,8 @@ FROM quay.io/almalinuxorg/almalinux:9 RUN dnf group install -y 'Minimal Install' --allowerasing && \ - dnf install -y findutils util-linux sudo python3 NetworkManager + dnf install -y findutils util-linux sudo python3 NetworkManager \ + curl libcurl --allowerasing RUN systemctl unmask console-getty.service dev-hugepages.mount \ getty.target sys-fs-fuse-connections.mount systemd-logind.service \ diff --git a/diskimage_builder/elements/rocky-container/containerfiles/8 b/diskimage_builder/elements/rocky-container/containerfiles/8 index 67e299c3d..a26e36662 100644 --- a/diskimage_builder/elements/rocky-container/containerfiles/8 +++ b/diskimage_builder/elements/rocky-container/containerfiles/8 @@ -2,7 +2,7 @@ FROM docker.io/library/rockylinux:8 RUN dnf group install -y 'Minimal Install' --allowerasing && \ dnf install -y findutils util-linux sudo python3 NetworkManager \ - NetworkManager-config-server + NetworkManager-config-server curl libcurl --allowerasing RUN systemctl unmask console-getty.service dev-hugepages.mount \ getty.target sys-fs-fuse-connections.mount systemd-logind.service \ diff --git a/diskimage_builder/elements/rocky-container/containerfiles/9 b/diskimage_builder/elements/rocky-container/containerfiles/9 index 240de587e..eac39ce83 100644 --- a/diskimage_builder/elements/rocky-container/containerfiles/9 +++ b/diskimage_builder/elements/rocky-container/containerfiles/9 @@ -2,7 +2,7 @@ FROM docker.io/rockylinux/rockylinux:9 RUN dnf group install -y 'Minimal Install' --allowerasing && \ dnf install -y findutils util-linux sudo python3 NetworkManager \ - NetworkManager-config-server + NetworkManager-config-server curl libcurl --allowerasing RUN systemctl unmask console-getty.service dev-hugepages.mount \ getty.target sys-fs-fuse-connections.mount systemd-logind.service \