Skip to content

Commit

Permalink
Allow different kayobe container image base images
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Alex-Welsh committed Aug 22, 2023
1 parent 5232d68 commit 40ee5b4
Showing 1 changed file with 10 additions and 6 deletions.
16 changes: 10 additions & 6 deletions docker/kayobe/Dockerfile
Original file line number Diff line number Diff line change
@@ -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" <[email protected]>

# Unclear at this time if different environments will change
Expand All @@ -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 \
libffi-devel sudo which openssh-server e2fsprogs rsync \
dnf install -y gcc git vim python3-pyyaml \
libffi-devel sudo which openssh-server e2fsprogs \
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
Expand All @@ -41,9 +45,9 @@ 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
RUN python3 -m pip3 install docker six

ENV KAYOBE_USER=stack
ARG KAYOBE_USER_UID=1000
Expand Down

0 comments on commit 40ee5b4

Please sign in to comment.