From 03033108a590db32bd7e18008348ff3a170aa5dd Mon Sep 17 00:00:00 2001 From: Liora Milbaum Date: Wed, 22 Nov 2023 06:53:08 +0200 Subject: [PATCH] Mass rename tier-1/boot => bootc --- .github/workflows/ci.yml | 7 +++++-- .github/workflows/docs.yml | 4 +++- .github/workflows/pre-commit.yml | 2 ++ .tekton/fedora-bootc-pull-request.yaml | 15 ++++++++------- .tekton/ostree-build.yaml | 15 +++++++++------ README.md | 4 ++-- docs/_config.yml | 14 +++++++------- docs/example.ks | 4 ++-- docs/index.md | 12 ++++++------ docs/install.md | 8 ++++---- tier-0/initramfs.yaml | 2 +- tier-1/persistent-journal.yaml | 2 +- 12 files changed, 50 insertions(+), 39 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1e79ea0..e57e6d0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,21 +7,24 @@ on: paths-ignore: - "docs/**" + workflow_dispatch: + jobs: build-image: runs-on: ubuntu-latest container: - image: quay.io/centos-boot/builder:latest + image: quay.io/centos-bootc/builder:latest options: --privileged strategy: matrix: os: [fedora, centos] - tier: [tier-1] include: - os: fedora + version: eln - os: centos + version: stream9 steps: - name: Checkout repository diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 15f0dfb..4c34c01 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -2,7 +2,9 @@ name: Docs on: push: - branches: ["main"] + branches: + - main + workflow_dispatch: permissions: diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 28aae5f..775be10 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -6,6 +6,8 @@ on: # yamllint disable-line rule:truthy branches: - main + workflow_dispatch: + jobs: pre_commit: runs-on: ubuntu-latest diff --git a/.tekton/fedora-bootc-pull-request.yaml b/.tekton/fedora-bootc-pull-request.yaml index 0149323..2b6c969 100644 --- a/.tekton/fedora-bootc-pull-request.yaml +++ b/.tekton/fedora-bootc-pull-request.yaml @@ -3,11 +3,12 @@ kind: PipelineRun metadata: annotations: build.appstudio.openshift.io/repo: https://github.com/CentOS/centos-bootc?rev={{revision}} - build.appstudio.redhat.com/commit_sha: '{{revision}}' - build.appstudio.redhat.com/pull_request_number: '{{pull_request_number}}' - build.appstudio.redhat.com/target_branch: '{{target_branch}}' + build.appstudio.redhat.com/commit_sha: "{{revision}}" + build.appstudio.redhat.com/pull_request_number: "{{pull_request_number}}" + build.appstudio.redhat.com/target_branch: "{{target_branch}}" pipelinesascode.tekton.dev/max-keep-runs: "3" - pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch + pipelinesascode.tekton.dev/on-cel-expression: + event == "pull_request" && target_branch == "main" creationTimestamp: null labels: @@ -21,13 +22,13 @@ spec: - name: image-file value: fedora-bootc.yaml - name: git-url - value: '{{repo_url}}' + value: "{{repo_url}}" - name: output-image value: quay.io/redhat-user-workloads/centos-bootc-tenant/centos-bootc/fedora-bootc:on-pr-{{revision}} - name: path-context value: . - name: revision - value: '{{revision}}' + value: "{{revision}}" pipelineRef: name: ostree-build workspaces: @@ -77,5 +78,5 @@ spec: status: {} - name: git-auth secret: - secretName: '{{ git_auth_secret }}' + secretName: "{{ git_auth_secret }}" status: {} diff --git a/.tekton/ostree-build.yaml b/.tekton/ostree-build.yaml index 437a6bb..7bfe28e 100644 --- a/.tekton/ostree-build.yaml +++ b/.tekton/ostree-build.yaml @@ -35,11 +35,13 @@ spec: name: output-image type: string - default: . - description: Path to the source code of an application's component from where + description: + Path to the source code of an application's component from where to build image. name: path-context type: string - - description: Path to the image file inside the context specified by parameter + - description: + Path to the image file inside the context specified by parameter path-context name: image-file type: string @@ -68,7 +70,8 @@ spec: name: java type: string - default: "" - description: Image tag expiration time, time values could be something like + description: + Image tag expiration time, time values could be something like 1h, 2d, 3w for hours, days, and weeks, respectively. name: image-expires-after results: @@ -206,7 +209,7 @@ spec: - name: PLATFORM value: linux/amd64 - name: BUILDER_IMAGE - value: quay.io/centos-boot/builder:latest + value: quay.io/centos-bootc/builder:latest runAfter: - clone-repository taskRef: @@ -241,7 +244,7 @@ spec: - name: PLATFORM value: linux/arm64 - name: BUILDER_IMAGE - value: quay.io/centos-boot/builder:latest + value: quay.io/centos-bootc/builder:latest runAfter: - clone-repository-arm64 taskRef: @@ -276,7 +279,7 @@ spec: - name: PLATFORM value: linux/s390x - name: BUILDER_IMAGE - value: quay.io/centos-boot/builder:latest + value: quay.io/centos-bootc/builder:latest runAfter: - clone-repository-s390x taskRef: diff --git a/README.md b/README.md index 6f2f677..5da17ca 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# centos-boot +# centos-bootc Create and maintain base *bootable* container images from Fedora ELN and CentOS Stream packages. @@ -18,4 +18,4 @@ for base operating system updates. ## More information -See the [project documentation](https://centos.github.io/centos-boot/). +See the [project documentation](https://centos.github.io/centos-bootc/). diff --git a/docs/_config.yml b/docs/_config.yml index d26cf8f..ae417ed 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -1,6 +1,6 @@ -title: centos/centos-boot -description: centos-boot documentation -baseurl: "/centos-boot" +title: centos/centos-bootc +description: centos-bootc documentation +baseurl: "/centos-bootc" url: "https://centos.github.io" # Comment above and use below for local development # url: "http://localhost:4000" @@ -32,10 +32,10 @@ color_scheme: coreos # Aux links for the upper right navigation aux_links: - "centos-boot on GitHub": - - "https://github.com/centos/centos-boot" + "centos-bootc on GitHub": + - "https://github.com/centos/centos-bootc" -footer_content: "Copyright © Red Hat, Inc. and others." +footer_content: 'Copyright © Red Hat, Inc. and others.' # Footer last edited timestamp last_edit_timestamp: true @@ -44,7 +44,7 @@ last_edit_time_format: "%b %e %Y at %I:%M %p" # Footer "Edit this page on GitHub" link text gh_edit_link: true gh_edit_link_text: "Edit this page on GitHub" -gh_edit_repository: "https://github.com/centos/centos-boot" +gh_edit_repository: "https://github.com/centos/centos-bootc" gh_edit_branch: "main" gh_edit_source: docs gh_edit_view_mode: "tree" diff --git a/docs/example.ks b/docs/example.ks index 0520bbe..f6d251f 100644 --- a/docs/example.ks +++ b/docs/example.ks @@ -8,8 +8,8 @@ part /boot/efi --size=100 --fstype=efi part /boot --size=1000 --fstype=ext4 --label=boot part / --grow --fstype xfs -ostreecontainer --url quay.io/centos-boot/fedora-tier-1:eln --no-signature-verification -# Or: quay.io/centos-boot/centos-tier-1-dev:stream9 +ostreecontainer --url quay.io/centos-bootc/fedora-bootc:eln --no-signature-verification +# Or: quay.io/centos-bootc/centos-bootc-dev:stream9 firewall --disabled services --enabled=sshd diff --git a/docs/index.md b/docs/index.md index 20d0124..757bfaa 100644 --- a/docs/index.md +++ b/docs/index.md @@ -17,13 +17,13 @@ and CentOS Stream 9. These images are intended to exactly match the content of the underlying distribution. -- `quay.io/centos-boot/fedora-tier-1:eln` -- `quay.io/centos-boot/centos-tier-1:stream9` +- `quay.io/centos-bootc/fedora-bootc:eln` +- `quay.io/centos-bootc/centos-bootc:stream9` ### Layered images There are also layered images; for more information on these, see -[the centos-boot-layered repository](https://github.com/CentOS/centos-boot-layered). +[the centos-bootc-layered repository](https://github.com/CentOS/centos-bootc-layered). ### Development images @@ -32,10 +32,10 @@ as they appear in git `main` instead of waiting for package releases. The following images track git main of selected components: -- `quay.io/centos-boot/fedora-tier-1-dev:eln` -- `quay.io/centos-boot/centos-tier-1-dev:stream9` +- `quay.io/centos-bootc/fedora-bootc-dev:eln` +- `quay.io/centos-bootc/centos-bootc-dev:stream9` -For more information, see [the dev repository](https://github.com/centos/centos-boot-dev). +For more information, see [the dev repository](https://github.com/centos/centos-bootc-dev). ## Trying it out diff --git a/docs/install.md b/docs/install.md index d809f0b..6ed41a2 100644 --- a/docs/install.md +++ b/docs/install.md @@ -4,11 +4,11 @@ nav_order: 2 # Trying out development builds -## Using fedora-boot-cloud via KVM +## Using fedora-bootc-cloud via KVM This repository defines a cloud-agnostic base image. However, many people who just want to "try things out" will find it easiest to start -with [the cloud image](https://github.com/CentOS/centos-boot-layered/tree/main/fedora-boot-cloud). +with [the cloud image](https://github.com/CentOS/centos-bootc-layered/tree/main/fedora-bootc-cloud). ## Operating system state (users, ssh keys) @@ -18,7 +18,7 @@ operating system content. Notably the default `tier-1` image recommended mechanism for provisioning user accountson its own. Commonly then you will want to build your own container image derived from e.g. -`quay.io/centos-boot/fedora-tier-1:eln` that adds a login mechanism. For +`quay.io/centos-bootc/fedora-bootc:eln` that adds a login mechanism. For example, you could [add cloud-init](https://gitlab.com/CentOS/cloud/sagano-examples/-/blob/main/cloud-init-base/Containerfile). @@ -88,7 +88,7 @@ custom derived image from CentOS boot. ```shell systemctl mask --now zincati && rm -vf /run/ostree/staged-deployment-locked echo "# dummy change" >> "/etc/sudoers.d/coreos-sudo-group" -rpm-ostree rebase ostree-unverified-registry:quay.io/centos-boot/fedora-tier-1:eln +rpm-ostree rebase ostree-unverified-registry:quay.io/centos-bootc/fedora-bootc:eln systemctl reboot ``` diff --git a/tier-0/initramfs.yaml b/tier-0/initramfs.yaml index 079cd96..f0529ad 100644 --- a/tier-0/initramfs.yaml +++ b/tier-0/initramfs.yaml @@ -11,6 +11,6 @@ postprocess: # We want this for systemd-cryptsetup tpm2 locking dracutmodules+=" tpm2-tss " EOF - cat > /usr/lib/dracut/dracut.conf.d/01-centos-boot-base.conf << 'EOF' + cat > /usr/lib/dracut/dracut.conf.d/01-centos-bootc-base.conf << 'EOF' dracutmodules+=" kernel-modules dracut-systemd systemd-initrd base " EOF diff --git a/tier-1/persistent-journal.yaml b/tier-1/persistent-journal.yaml index 969f96e..ccc6c5f 100644 --- a/tier-1/persistent-journal.yaml +++ b/tier-1/persistent-journal.yaml @@ -7,7 +7,7 @@ postprocess: - | #!/bin/bash mkdir -p /usr/lib/systemd/journald.conf.d/ - cat >/usr/lib/systemd/journald.conf.d/10-centos-boot-persistent.conf << EOF + cat >/usr/lib/systemd/journald.conf.d/10-centos-bootc-persistent.conf << EOF [Journal] Storage=persistent EOF