Skip to content
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.

Sign up for GitHub

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

⚠️ DO NOT MERGE Use CentOS Stream 10 as base image #581

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

⚠️ DO NOT MERGE Use CentOS Stream 10 as base image #581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG BASE_IMAGE=quay.io/centos/centos:stream9
ARG BASE_IMAGE=quay.io/centos/centos:stream10

## Build iPXE w/ IPv6 Support
## Note: we are pinning to a specific commit for reproducible builds.
Expand Down
5 changes: 4 additions & 1 deletion prepare-efi.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,12 @@ if [[ "$ARCH" == "x86_64" ]]; then
PACKAGES=grub2-efi-x64
BOOTEFI=BOOTX64.EFI
GRUBEFI=grubx64.efi
SHIM_PKG=shim-x64
elif [[ "$ARCH" == "aarch64" ]]; then
PACKAGES=grub2-efi-aa64
BOOTEFI=BOOTAA64.EFI
GRUBEFI=grubaa64.efi
SHIM_PKG=shim-aa64
else
echo "WARNING: don't know how to build an EFI image on $ARCH"
touch "$DEST"
Expand All @@ -29,7 +31,8 @@ fi
# ``Cannot initialize '::'``
# This is due to the conversion table missing codepage 850, included in glibc-gconv-extra
# shellcheck disable=SC2086
dnf install -y grub2 shim dosfstools mtools glibc-gconv-extra $PACKAGES
dnf install -y mtools dosfstools grub2 shim $SHIM_PKG glibc-gconv-extra $PACKAGES
#dnf reinstall -y mtools dosfstools grub2 shim $SHIM_PKG glibc-gconv-extra $PACKAGES

## TODO(TheJulia): At some point we may want to try and make the size
## of the ESP image file to be sized smaller for the files that need to
Expand Down
10 changes: 6 additions & 4 deletions prepare-image.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ echo "tsflags=nodocs" >> /etc/dnf/dnf.conf

dnf install -y 'dnf-command(config-manager)'

# emulate uid/gid configuration to match rpm install
IRONIC_UID=997
IRONIC_GID=994

Expand Down Expand Up @@ -57,6 +56,8 @@ python3 -m pip install --no-cache-dir --ignore-installed --prefix /usr -r "${IRO

# ironic system configuration
mkdir -p /var/log/ironic /var/lib/ironic
#getent group "${IRONIC_GID}"
#getent passwd "${IRONIC_UID}"
getent group ironic > /dev/null || groupadd -r ironic -g "${IRONIC_GID}"
getent passwd ironic > /dev/null || useradd -r -g ironic -u "${IRONIC_UID}" -s /sbin/nologin ironic -d /var/lib/ironic

Expand All @@ -71,9 +72,10 @@ if [[ -n "${EXTRA_PKGS_LIST:-}" ]]; then
fi
fi

dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm
dnf config-manager --set-disabled epel
dnf install -y --enablerepo=epel inotify-tools
#dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-10.noarch.rpm
#dnf config-manager --set-disabled epel
#dnf install -y --enablerepo=epel inotify-tools
dnf install -y https://rpmfind.net/linux/fedora/linux/releases/40/Everything/x86_64/os/Packages/i/inotify-tools-3.22.1.0-7.fc40.x86_64.rpm

dnf remove -y --noautoremove 'dnf-command(config-manager)'

Expand Down
Loading