diff --git a/.github/workflows/build-push-images.yml b/.github/workflows/build-push-images.yml index faeb4e3..661258a 100644 --- a/.github/workflows/build-push-images.yml +++ b/.github/workflows/build-push-images.yml @@ -1,10 +1,9 @@ name: publish-image on: - push: branches: - - main + - main workflow_dispatch: @@ -13,7 +12,7 @@ jobs: runs-on: ubuntu-latest env: - dir: fedora-boot-cloud + dir: fedora-bootc-cloud steps: - name: Install qemu dependency @@ -31,7 +30,7 @@ jobs: id: build uses: redhat-actions/buildah-build@b4dc19b4ba891854660ab1f88a097d45aa158f76 # v2.12 with: - image: quay.io/centos-boot/${{ env.dir }} + image: quay.io/centos-bootc/${{ env.dir }} tags: eln oci: true containerfiles: ./${{ env.dir }}/Containerfile diff --git a/Containerfile b/Containerfile index 5d28234..b9a7208 100644 --- a/Containerfile +++ b/Containerfile @@ -1,6 +1,6 @@ # This image contains cloud-init, which makes it usable out of the box # for e.g. a pre-generated AWS or KVM guest system. -FROM quay.io/centos-boot/fedora-tier-1:eln@sha256:4693953634fc2c3bff8d53a5f81a4682ac1aeb53b8184703273eef320eda66ef +FROM quay.io/centos-bootc/fedora-bootc:eln RUN dnf -y install cloud-init && \ ln -s ../cloud-init.target /usr/lib/systemd/system/default.target.wants && \ rm /var/log/*.log /var/lib/dnf -rf && ostree container commit diff --git a/README.md b/README.md index 8809589..472de7e 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ -# centos-boot-layered +# centos-bootc-layered -Images layered on top of the core [centos-boot][5] base images. +Images layered on top of the core [centos-bootc][5] base images. ## Available images -### `quay.io/centos-boot/fedora-boot-cloud:eln` +### `quay.io/centos-boot/fedora-bootc-cloud:eln` -This [simple image](fedora-boot-cloud/) builds on top of the base Fedora ELN image +This [simple image](fedora-bootc-cloud/) builds on top of the base Fedora ELN image and adds cloud-init. ## Badges @@ -20,4 +20,4 @@ and adds cloud-init. [2]: https://renovatebot.com [3]: https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit [4]: https://pre-commit.com/ -[5]: https://github.com/CentOS/centos-boot +[5]: https://github.com/CentOS/centos-bootc diff --git a/fedora-boot-cloud/Containerfile b/fedora-boot-cloud/Containerfile index dc0c6ee..05d97ed 100644 --- a/fedora-boot-cloud/Containerfile +++ b/fedora-boot-cloud/Containerfile @@ -1,6 +1,6 @@ # This image contains cloud-init, which makes it usable out of the box # for e.g. a pre-generated AWS or KVM guest system. -FROM quay.io/centos-boot/fedora-tier-1-dev:eln@sha256:180c9390564e00e923af2baebbc6bb92463aba8e5271c578bf61a05580c45b12 +FROM quay.io/centos-bootc/fedora-dev-bootc:eln RUN dnf -y install cloud-init && \ ln -s ../cloud-init.target /usr/lib/systemd/system/default.target.wants && \ rm /var/log/*.log /var/lib/dnf -rf && ostree container commit diff --git a/fedora-boot-cloud/README.md b/fedora-boot-cloud/README.md index aa982cb..497dc44 100644 --- a/fedora-boot-cloud/README.md +++ b/fedora-boot-cloud/README.md @@ -1,13 +1,13 @@ -# fedora-boot-cloud:eln +# fedora-bootc-cloud:eln This container image [Containerfile](Containerfile) builds on top of the -[base Fedora ELN image](github.com/centos/centos-boot) and adds cloud-init. It +[base Fedora ELN image](github.com/centos/centos-bootc) and adds cloud-init. It can be used in any virtualization/IaaS system that is [supported by cloud-init](https://cloudinit.readthedocs.io/en/latest/reference/datasources.html) such as [libvirt](https://blog.wikichoon.com/2020/09/virt-install-cloud-init.html), AWS, etc. -- Pull spec: `quay.io/centos-boot/fedora-boot-cloud:eln` -- Download QCOW2: [Download](https://storage.googleapis.com/centos-boot-dev/fedora-boot-cloud.qcow2). +- Pull spec: `quay.io/centos-bootc/fedora-bootc-cloud:eln` +- Download QCOW2: [Download](https://storage.googleapis.com/centos-bootc-dev/fedora-bootc-cloud.qcow2). The qcow2 image was built using [osbuildbootc](https://github.com/cgwalters/osbuildbootc).