diff --git a/Containerfile.centos-stream10 b/Containerfile.centos-stream10 deleted file mode 100644 index d54df79..0000000 --- a/Containerfile.centos-stream10 +++ /dev/null @@ -1,28 +0,0 @@ -# See Containerfile.centos-stream9 for more information. - -FROM quay.io/centos/centos:stream10-development as repos - -FROM quay.io/centos-bootc/bootc-image-builder:latest as builder -ARG MANIFEST=centos-stream-10-tier1.yaml -RUN --mount=type=bind,rw=true,src=.,dst=/buildcontext,bind-propagation=shared rm -vf /buildcontext/*.repo -# XXX: we should just make sure our in-tree c9s repo points to the c9s paths and doesn't require vars to avoid these steps entirely -COPY --from=repos /etc/dnf/vars /etc/dnf/vars -# The input git repository has .repo files committed to git rpm-ostree has historically -# emphasized that. But here, we are fetching the repos from the container base image. -# So copy the source, and delete the hardcoded ones in git, and use the container base -# image ones. We can drop the ones commited to git when we hard switch to Containerfile. -COPY . /src -WORKDIR /src -RUN rm -vf /src/*.repo -COPY --from=repos /etc/yum.repos.d/centos.repo c10s.repo -COPY --from=repos /etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial /etc/pki/rpm-gpg -# rpm-ostree doesn't honor /etc/dnf/vars right now -RUN for n in $(ls /etc/dnf/vars); do v=$(cat /etc/dnf/vars/$n); sed -ie s,\$${n},$v, c10s.repo; done -RUN --mount=type=cache,target=/workdir --mount=type=bind,rw=true,src=.,dst=/buildcontext,bind-propagation=shared \ - rpm-ostree compose image --image-config centos-bootc-config.json \ - --cachedir=/workdir --format=ociarchive --initialize ${MANIFEST} /buildcontext/out.ociarchive - -FROM oci-archive:./out.ociarchive -# Need to reference builder here to force ordering. But since we have to run -# something anyway, we might as well cleanup after ourselves. -RUN --mount=type=bind,from=builder,src=.,target=/var/tmp --mount=type=bind,rw=true,src=.,dst=/buildcontext,bind-propagation=shared rm /buildcontext/out.ociarchive diff --git a/Containerfile.centos-stream9 b/Containerfile.centos-stream9 deleted file mode 100644 index 9c98554..0000000 --- a/Containerfile.centos-stream9 +++ /dev/null @@ -1,49 +0,0 @@ -# This container build uses some special features of podman that allow -# a process executing as part of a container build to generate a new container -# image "from scratch". -# -# This container build uses nested containerization, so you must build with e.g. -# podman build --security-opt=label=disable --cap-add=all --device /dev/fuse <...> -# -# # Why are we doing this? -# -# Today this base image build process uses rpm-ostree. There is a lot of things that -# rpm-ostree does when generating a container image...but important parts include: -# -# - auto-updating labels in the container metadata -# - Generating "chunked" content-addressed reproducible image layers (notice -# how there are ~60 layers in the generated image) -# -# The latter bit in particular is currently impossible to do from Containerfile. -# A future goal is adding some support for this in a way that can be honored by -# buildah (xref https://github.com/containers/podman/discussions/12605) -# -# # Why does this build process require additional privileges? -# -# Because it's generating a base image and uses containerization features itself. -# In the future some of this can be lifted. - -FROM quay.io/centos/centos:stream9 as repos - -FROM quay.io/centos-bootc/bootc-image-builder:latest as builder -ARG MANIFEST=centos-stream-9-tier1.yaml -# XXX: we should just make sure our in-tree c9s repo points to the c9s paths and doesn't require vars to avoid these steps entirely -COPY --from=repos /etc/dnf/vars /etc/dnf/vars -# The input git repository has .repo files committed to git rpm-ostree has historically -# emphasized that. But here, we are fetching the repos from the container base image. -# So copy the source, and delete the hardcoded ones in git, and use the container base -# image ones. We can drop the ones commited to git when we hard switch to Containerfile. -COPY . /src -WORKDIR /src -RUN rm -vf /src/*.repo -COPY --from=repos /etc/yum.repos.d/centos.repo c9s.repo -COPY --from=repos /etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial /etc/pki/rpm-gpg -# rpm-ostree doesn't honor /etc/dnf/vars right now -RUN for n in $(ls /etc/dnf/vars); do v=$(cat /etc/dnf/vars/$n); sed -ie s,\$${n},$v, c9s.repo; done -RUN --mount=type=cache,target=/workdir --mount=type=bind,rw=true,src=.,dst=/buildcontext,bind-propagation=shared \ - rpm-ostree compose image --image-config centos-bootc-config.json --cachedir=/workdir --format=ociarchive --initialize ${MANIFEST} /buildcontext/out.ociarchive - -FROM oci-archive:./out.ociarchive -# Need to reference builder here to force ordering. But since we have to run -# something anyway, we might as well cleanup after ourselves. -RUN --mount=type=bind,from=builder,src=.,target=/var/tmp --mount=type=bind,rw=true,src=.,dst=/buildcontext,bind-propagation=shared rm /buildcontext/out.ociarchive diff --git a/c9s.repo b/c9s.repo deleted file mode 100644 index 67e8ab8..0000000 --- a/c9s.repo +++ /dev/null @@ -1,31 +0,0 @@ -[baseos] -name=CentOS Stream 9 - BaseOS -baseurl=https://composes.stream.centos.org/production/CentOS-Stream-9-20240415.0/compose/BaseOS/$basearch/os -gpgcheck=1 -repo_gpgcheck=0 -enabled=1 -gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official - -[appstream] -name=CentOS Stream 9 - AppStream -baseurl=https://composes.stream.centos.org/production/CentOS-Stream-9-20240415.0/compose/AppStream/$basearch/os -gpgcheck=1 -repo_gpgcheck=0 -enabled=1 -gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official - -[nfv] -name=CentOS Stream 9 - NFV -baseurl=https://composes.stream.centos.org/production/CentOS-Stream-9-20240415.0/compose/NFV/$basearch/os -gpgcheck=1 -repo_gpgcheck=0 -enabled=1 -gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official - -[rt] -name=CentOS Stream 9 - RT -baseurl=https://composes.stream.centos.org/production/CentOS-Stream-9-20240415.0/compose/RT/$basearch/os -gpgcheck=1 -repo_gpgcheck=0 -enabled=1 -gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official diff --git a/centos-bootc-config.json b/centos-bootc-config.json deleted file mode 100644 index 059c9ff..0000000 --- a/centos-bootc-config.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "Labels": { - "containers.bootc": "1", - "bootc.diskimage-builder": "quay.io/centos-bootc/bootc-image-builder", - "redhat.compose-id": "CentOS-Stream-9-20240304.d.0", - "redhat.id": "centos", - "redhat.version-id": "9" - }, - "StopSignal": "SIGRTMIN+3" -} diff --git a/centos-stream-10-tier1.yaml b/centos-stream-10-tier1.yaml deleted file mode 100644 index f0ce3f3..0000000 --- a/centos-stream-10-tier1.yaml +++ /dev/null @@ -1,4 +0,0 @@ -include: - - centos-stream-10.yaml - - tier-1/kernel.yaml - - tier-1/manifest.yaml diff --git a/centos-stream-10.yaml b/centos-stream-10.yaml deleted file mode 100644 index 899ed3e..0000000 --- a/centos-stream-10.yaml +++ /dev/null @@ -1,6 +0,0 @@ -releasever: stream10 -variables: - distro: "stream10" - -include: - - centos-stream-common.yaml diff --git a/centos-stream-9-tier1.yaml b/centos-stream-9-tier1.yaml deleted file mode 100644 index 24c0722..0000000 --- a/centos-stream-9-tier1.yaml +++ /dev/null @@ -1,4 +0,0 @@ -include: - - centos-stream-9.yaml - - tier-1/kernel.yaml - - tier-1/manifest.yaml diff --git a/centos-stream-9.yaml b/centos-stream-9.yaml deleted file mode 100644 index 744f873..0000000 --- a/centos-stream-9.yaml +++ /dev/null @@ -1,6 +0,0 @@ -releasever: stream9 -variables: - distro: "stream9" - -include: - - centos-stream-common.yaml diff --git a/centos-stream-common.yaml b/centos-stream-common.yaml deleted file mode 100644 index 16c0981..0000000 --- a/centos-stream-common.yaml +++ /dev/null @@ -1,14 +0,0 @@ -repos: - - baseos - - appstream - -# Configuration for bootc -postprocess: - # XFS is our default filesystem - - | - #!/usr/bin/env bash - mkdir -p /usr/lib/bootc/install/ - cat > /usr/lib/bootc/install/20-rhel.toml << EOF - [install] - root-fs-type = "xfs" - EOF diff --git a/centos-tier-0-rt-stream9.yaml b/centos-tier-0-rt-stream9.yaml deleted file mode 100644 index a58fe8c..0000000 --- a/centos-tier-0-rt-stream9.yaml +++ /dev/null @@ -1,4 +0,0 @@ -include: - - centos-stream-9.yaml - - tier-0/kernel-rt.yaml - - tier-0/manifest.yaml diff --git a/centos-tier-0-stream9.yaml b/centos-tier-0-stream9.yaml deleted file mode 100644 index fe66794..0000000 --- a/centos-tier-0-stream9.yaml +++ /dev/null @@ -1,4 +0,0 @@ -include: - - centos-stream-9.yaml - - tier-0/kernel.yaml - - tier-0/manifest.yaml diff --git a/centos-tier-1-rt-stream9.yaml b/centos-tier-1-rt-stream9.yaml deleted file mode 100644 index 7fd0264..0000000 --- a/centos-tier-1-rt-stream9.yaml +++ /dev/null @@ -1,4 +0,0 @@ -include: - - centos-stream-9.yaml - - tier-0/kernel-rt.yaml - - tier-1/manifest.yaml