From 1185ad3effd73914fe0943eb7cb85a07d079fe70 Mon Sep 17 00:00:00 2001 From: Mark Kemel Date: Thu, 28 Mar 2024 08:59:25 +0200 Subject: [PATCH] Make skipper use build-base image for build container Moving Containerfile.bluechi-rpm-build to containers dir has broken skipper operation when building rpms locally. We can remove it completely, and make skipper use the `build-base` image. Signed-off-by: Mark Kemel --- containers/Containerfile.bluechi-rpm-build | 4 ---- containers/build-base | 1 + skipper.yaml | 3 ++- 3 files changed, 3 insertions(+), 5 deletions(-) delete mode 100644 containers/Containerfile.bluechi-rpm-build diff --git a/containers/Containerfile.bluechi-rpm-build b/containers/Containerfile.bluechi-rpm-build deleted file mode 100644 index b01393e06d..0000000000 --- a/containers/Containerfile.bluechi-rpm-build +++ /dev/null @@ -1,4 +0,0 @@ -FROM quay.io/bluechi/build-base:latest - -RUN dnf install --nodocs -y python3-devel && \ - dnf -y clean all diff --git a/containers/build-base b/containers/build-base index c35fffe9f5..8bd1495693 100644 --- a/containers/build-base +++ b/containers/build-base @@ -24,6 +24,7 @@ RUN dnf install -y dnf-plugin-config-manager && \ meson \ python3-html2text \ python3-pip \ + python3-devel \ rpm-build \ sed \ selinux-policy-devel \ diff --git a/skipper.yaml b/skipper.yaml index 6eb23511c3..aaecab784e 100644 --- a/skipper.yaml +++ b/skipper.yaml @@ -1,3 +1,4 @@ -build_container_image: bluechi-rpm-build +build_container_image: quay.io/bluechi/build-base +build_container_tag: latest make: makefile: Makefile.skipper