From c83ea873eaa4f9d05e61dd8c01f6c0f9820e4afa Mon Sep 17 00:00:00 2001 From: Alex-Welsh Date: Tue, 22 Aug 2023 10:55:56 +0100 Subject: [PATCH] Allow different kayobe container image base images This change adds an argument to change the base image when building a kayobe container image. This is required for the Zed release of Openstack because there is no support for CentOS 8. --- docker/kayobe/Dockerfile | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/docker/kayobe/Dockerfile b/docker/kayobe/Dockerfile index 990c004..d845ffe 100644 --- a/docker/kayobe/Dockerfile +++ b/docker/kayobe/Dockerfile @@ -1,6 +1,7 @@ # syntax=docker/dockerfile:1.2 -FROM quay.io/centos/centos:stream8 +ARG BASE_IMAGE="quay.io/centos/centos:stream8" +FROM ${BASE_IMAGE} MAINTAINER "Will Szumski" # Unclear at this time if different environments will change @@ -22,13 +23,16 @@ ENV container docker # VOLUME [ "/sys/fs/cgroup" ] # CMD ["/usr/sbin/init"] - +ARG BASE_IMAGE="quay.io/centos/centos:stream8" RUN dnf install epel-release -y && \ dnf update -y --nobest && \ - dnf install -y gcc git vim python3-pyyaml python3-virtualenv \ + dnf install -y gcc git vim python3-pyyaml \ libffi-devel sudo which openssh-server e2fsprogs rsync \ diffstat diffutils debootstrap procps-ng gdisk util-linux \ dosfstools lvm2 kpartx systemd-udev bash-completion && \ + if [ "$BASE_IMAGE" != "rockylinux:9" ] ; then \ + dnf install -y python3-virtualenv rsync-3.1.3-14.el8 ; else \ + dnf install -y rsync fi && \ dnf clean all # Configure lvm not to use udev for device discovery. This allows you to use @@ -41,7 +45,7 @@ RUN sed -i 's/# udev_rules = 1/udev_rules = 0/g' /etc/lvm/lvm.conf && \ # Hoepfully they have fixed this issue before this old # package is removed. # See: https://bugzilla.redhat.com/show_bug.cgi?id=2043753 -RUN dnf install -y rsync-3.1.3-14.el8 && dnf clean all +# RUN dnf install -y rsync-3.1.3-14.el8 && dnf clean all RUN python3 -m pip install docker six