Skip to content

Commit

Permalink
DO NOT MERGE Use CentOS Stream 10 as base image
Browse files Browse the repository at this point in the history
This is still experimental.
Current blockers:
- epel 10 repository is still in development
- inotify-tools package for el10 is not available yet
  • Loading branch information
elfosardo committed Dec 12, 2024
1 parent 276cd0e commit 4df1345
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
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
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
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

0 comments on commit 4df1345

Please sign in to comment.