-
Notifications
You must be signed in to change notification settings - Fork 2
Allow rockylinux:9 base image #34
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,10 @@ | ||
# syntax=docker/dockerfile:1.2 | ||
|
||
FROM quay.io/centos/centos:stream8 | ||
# NOTE: Currently supported images: | ||
# quay.io/centos/centos:stream8 | ||
# rockylinux:9 | ||
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 | ||
|
@@ -22,13 +26,21 @@ ENV container docker | |
# VOLUME [ "/sys/fs/cgroup" ] | ||
|
||
# CMD ["/usr/sbin/init"] | ||
|
||
# Note on CentOS 8 rsync-3.1.3-14.el8 install: | ||
# Workaround rsync: --sparse-block=1024: unknown option | ||
# Hopepfully they have fixed this issue before this old | ||
# package is removed. | ||
# See: https://bugzilla.redhat.com/show_bug.cgi?id=2043753 | ||
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 [ "$(grep "^PRETTY_NAME=\"Rocky Linux 9" /etc/os-release)" ] ; then \ | ||
dnf install -y rsync python3 python3-pip ; else \ | ||
dnf install -y python3-virtualenv rsync-3.1.3-14.el8 ; fi && \ | ||
dnf clean all | ||
|
||
# Configure lvm not to use udev for device discovery. This allows you to use | ||
|
@@ -37,12 +49,6 @@ RUN dnf install epel-release -y && \ | |
RUN sed -i 's/# udev_rules = 1/udev_rules = 0/g' /etc/lvm/lvm.conf && \ | ||
sed -i 's/# udev_sync = 1/udev_sync = 0/g' /etc/lvm/lvm.conf | ||
|
||
# Workaround: rsync: --sparse-block=1024: unknown option | ||
# 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 python3 -m pip install docker six | ||
|
||
ENV KAYOBE_USER=stack | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I haven't tested this change with CS8, but I'm assuming I can move this to the core
dnf install
. I'm happy to move it back if I'm assuming wrongly though.