Merge pull request #64 from lmilbaum/rename
Mass rename tier-1/boot => bootc
This commit is contained in:
commit
8defe60823
|
|
@ -7,21 +7,24 @@ on:
|
||||||
paths-ignore:
|
paths-ignore:
|
||||||
- "docs/**"
|
- "docs/**"
|
||||||
|
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build-image:
|
build-image:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
container:
|
container:
|
||||||
image: quay.io/centos-boot/builder:latest
|
image: quay.io/centos-bootc/builder:latest
|
||||||
options: --privileged
|
options: --privileged
|
||||||
|
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
os: [fedora, centos]
|
os: [fedora, centos]
|
||||||
tier: [tier-1]
|
|
||||||
include:
|
include:
|
||||||
- os: fedora
|
- os: fedora
|
||||||
|
version: eln
|
||||||
- os: centos
|
- os: centos
|
||||||
|
version: stream9
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,9 @@ name: Docs
|
||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches: ["main"]
|
branches:
|
||||||
|
- main
|
||||||
|
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
|
||||||
permissions:
|
permissions:
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,8 @@ on: # yamllint disable-line rule:truthy
|
||||||
branches:
|
branches:
|
||||||
- main
|
- main
|
||||||
|
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
pre_commit:
|
pre_commit:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
|
||||||
|
|
@ -3,11 +3,12 @@ kind: PipelineRun
|
||||||
metadata:
|
metadata:
|
||||||
annotations:
|
annotations:
|
||||||
build.appstudio.openshift.io/repo: https://github.com/CentOS/centos-bootc?rev={{revision}}
|
build.appstudio.openshift.io/repo: https://github.com/CentOS/centos-bootc?rev={{revision}}
|
||||||
build.appstudio.redhat.com/commit_sha: '{{revision}}'
|
build.appstudio.redhat.com/commit_sha: "{{revision}}"
|
||||||
build.appstudio.redhat.com/pull_request_number: '{{pull_request_number}}'
|
build.appstudio.redhat.com/pull_request_number: "{{pull_request_number}}"
|
||||||
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
|
build.appstudio.redhat.com/target_branch: "{{target_branch}}"
|
||||||
pipelinesascode.tekton.dev/max-keep-runs: "3"
|
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"
|
== "main"
|
||||||
creationTimestamp: null
|
creationTimestamp: null
|
||||||
labels:
|
labels:
|
||||||
|
|
@ -21,13 +22,13 @@ spec:
|
||||||
- name: image-file
|
- name: image-file
|
||||||
value: fedora-bootc.yaml
|
value: fedora-bootc.yaml
|
||||||
- name: git-url
|
- name: git-url
|
||||||
value: '{{repo_url}}'
|
value: "{{repo_url}}"
|
||||||
- name: output-image
|
- name: output-image
|
||||||
value: quay.io/redhat-user-workloads/centos-bootc-tenant/centos-bootc/fedora-bootc:on-pr-{{revision}}
|
value: quay.io/redhat-user-workloads/centos-bootc-tenant/centos-bootc/fedora-bootc:on-pr-{{revision}}
|
||||||
- name: path-context
|
- name: path-context
|
||||||
value: .
|
value: .
|
||||||
- name: revision
|
- name: revision
|
||||||
value: '{{revision}}'
|
value: "{{revision}}"
|
||||||
pipelineRef:
|
pipelineRef:
|
||||||
name: ostree-build
|
name: ostree-build
|
||||||
workspaces:
|
workspaces:
|
||||||
|
|
@ -77,5 +78,5 @@ spec:
|
||||||
status: {}
|
status: {}
|
||||||
- name: git-auth
|
- name: git-auth
|
||||||
secret:
|
secret:
|
||||||
secretName: '{{ git_auth_secret }}'
|
secretName: "{{ git_auth_secret }}"
|
||||||
status: {}
|
status: {}
|
||||||
|
|
|
||||||
|
|
@ -35,11 +35,13 @@ spec:
|
||||||
name: output-image
|
name: output-image
|
||||||
type: string
|
type: string
|
||||||
- default: .
|
- 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.
|
to build image.
|
||||||
name: path-context
|
name: path-context
|
||||||
type: string
|
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
|
path-context
|
||||||
name: image-file
|
name: image-file
|
||||||
type: string
|
type: string
|
||||||
|
|
@ -68,7 +70,8 @@ spec:
|
||||||
name: java
|
name: java
|
||||||
type: string
|
type: string
|
||||||
- default: ""
|
- 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.
|
1h, 2d, 3w for hours, days, and weeks, respectively.
|
||||||
name: image-expires-after
|
name: image-expires-after
|
||||||
results:
|
results:
|
||||||
|
|
@ -206,7 +209,7 @@ spec:
|
||||||
- name: PLATFORM
|
- name: PLATFORM
|
||||||
value: linux/amd64
|
value: linux/amd64
|
||||||
- name: BUILDER_IMAGE
|
- name: BUILDER_IMAGE
|
||||||
value: quay.io/centos-boot/builder:latest
|
value: quay.io/centos-bootc/builder:latest
|
||||||
runAfter:
|
runAfter:
|
||||||
- clone-repository
|
- clone-repository
|
||||||
taskRef:
|
taskRef:
|
||||||
|
|
@ -241,7 +244,7 @@ spec:
|
||||||
- name: PLATFORM
|
- name: PLATFORM
|
||||||
value: linux/arm64
|
value: linux/arm64
|
||||||
- name: BUILDER_IMAGE
|
- name: BUILDER_IMAGE
|
||||||
value: quay.io/centos-boot/builder:latest
|
value: quay.io/centos-bootc/builder:latest
|
||||||
runAfter:
|
runAfter:
|
||||||
- clone-repository-arm64
|
- clone-repository-arm64
|
||||||
taskRef:
|
taskRef:
|
||||||
|
|
@ -276,7 +279,7 @@ spec:
|
||||||
- name: PLATFORM
|
- name: PLATFORM
|
||||||
value: linux/s390x
|
value: linux/s390x
|
||||||
- name: BUILDER_IMAGE
|
- name: BUILDER_IMAGE
|
||||||
value: quay.io/centos-boot/builder:latest
|
value: quay.io/centos-bootc/builder:latest
|
||||||
runAfter:
|
runAfter:
|
||||||
- clone-repository-s390x
|
- clone-repository-s390x
|
||||||
taskRef:
|
taskRef:
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
# centos-boot
|
# centos-bootc
|
||||||
|
|
||||||
Create and maintain base *bootable* container images from Fedora ELN and
|
Create and maintain base *bootable* container images from Fedora ELN and
|
||||||
CentOS Stream packages.
|
CentOS Stream packages.
|
||||||
|
|
@ -18,4 +18,4 @@ for base operating system updates.
|
||||||
|
|
||||||
## More information
|
## More information
|
||||||
|
|
||||||
See the [project documentation](https://centos.github.io/centos-boot/).
|
See the [project documentation](https://centos.github.io/centos-bootc/).
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
title: centos/centos-boot
|
title: centos/centos-bootc
|
||||||
description: centos-boot documentation
|
description: centos-bootc documentation
|
||||||
baseurl: "/centos-boot"
|
baseurl: "/centos-bootc"
|
||||||
url: "https://centos.github.io"
|
url: "https://centos.github.io"
|
||||||
# Comment above and use below for local development
|
# Comment above and use below for local development
|
||||||
# url: "http://localhost:4000"
|
# url: "http://localhost:4000"
|
||||||
|
|
@ -32,10 +32,10 @@ color_scheme: coreos
|
||||||
|
|
||||||
# Aux links for the upper right navigation
|
# Aux links for the upper right navigation
|
||||||
aux_links:
|
aux_links:
|
||||||
"centos-boot on GitHub":
|
"centos-bootc on GitHub":
|
||||||
- "https://github.com/centos/centos-boot"
|
- "https://github.com/centos/centos-bootc"
|
||||||
|
|
||||||
footer_content: "Copyright © <a href=\"https://www.redhat.com\">Red Hat, Inc.</a> and <a href=\"https://github.com/containers\">others</a>."
|
footer_content: 'Copyright © <a href="https://www.redhat.com">Red Hat, Inc.</a> and <a href="https://github.com/containers">others</a>.'
|
||||||
|
|
||||||
# Footer last edited timestamp
|
# Footer last edited timestamp
|
||||||
last_edit_timestamp: true
|
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
|
# Footer "Edit this page on GitHub" link text
|
||||||
gh_edit_link: true
|
gh_edit_link: true
|
||||||
gh_edit_link_text: "Edit this page on GitHub"
|
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_branch: "main"
|
||||||
gh_edit_source: docs
|
gh_edit_source: docs
|
||||||
gh_edit_view_mode: "tree"
|
gh_edit_view_mode: "tree"
|
||||||
|
|
|
||||||
|
|
@ -8,8 +8,8 @@ part /boot/efi --size=100 --fstype=efi
|
||||||
part /boot --size=1000 --fstype=ext4 --label=boot
|
part /boot --size=1000 --fstype=ext4 --label=boot
|
||||||
part / --grow --fstype xfs
|
part / --grow --fstype xfs
|
||||||
|
|
||||||
ostreecontainer --url quay.io/centos-boot/fedora-tier-1:eln --no-signature-verification
|
ostreecontainer --url quay.io/centos-bootc/fedora-bootc:eln --no-signature-verification
|
||||||
# Or: quay.io/centos-boot/centos-tier-1-dev:stream9
|
# Or: quay.io/centos-bootc/centos-bootc-dev:stream9
|
||||||
|
|
||||||
firewall --disabled
|
firewall --disabled
|
||||||
services --enabled=sshd
|
services --enabled=sshd
|
||||||
|
|
|
||||||
|
|
@ -17,13 +17,13 @@ and CentOS Stream 9.
|
||||||
|
|
||||||
These images are intended to exactly match the content of the underlying distribution.
|
These images are intended to exactly match the content of the underlying distribution.
|
||||||
|
|
||||||
- `quay.io/centos-boot/fedora-tier-1:eln`
|
- `quay.io/centos-bootc/fedora-bootc:eln`
|
||||||
- `quay.io/centos-boot/centos-tier-1:stream9`
|
- `quay.io/centos-bootc/centos-bootc:stream9`
|
||||||
|
|
||||||
### Layered images
|
### Layered images
|
||||||
|
|
||||||
There are also layered images; for more information on these, see
|
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
|
### 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:
|
The following images track git main of selected components:
|
||||||
|
|
||||||
- `quay.io/centos-boot/fedora-tier-1-dev:eln`
|
- `quay.io/centos-bootc/fedora-bootc-dev:eln`
|
||||||
- `quay.io/centos-boot/centos-tier-1-dev:stream9`
|
- `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
|
## Trying it out
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -4,11 +4,11 @@ nav_order: 2
|
||||||
|
|
||||||
# Trying out development builds
|
# 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
|
This repository defines a cloud-agnostic base image. However, many
|
||||||
people who just want to "try things out" will find it easiest to start
|
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)
|
## 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.
|
recommended mechanism for provisioning user accountson its own.
|
||||||
|
|
||||||
Commonly then you will want to build your own container image derived from e.g.
|
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
|
example, you could
|
||||||
[add cloud-init](https://gitlab.com/CentOS/cloud/sagano-examples/-/blob/main/cloud-init-base/Containerfile).
|
[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
|
```shell
|
||||||
systemctl mask --now zincati && rm -vf /run/ostree/staged-deployment-locked
|
systemctl mask --now zincati && rm -vf /run/ostree/staged-deployment-locked
|
||||||
echo "# dummy change" >> "/etc/sudoers.d/coreos-sudo-group"
|
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
|
systemctl reboot
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -11,6 +11,6 @@ postprocess:
|
||||||
# We want this for systemd-cryptsetup tpm2 locking
|
# We want this for systemd-cryptsetup tpm2 locking
|
||||||
dracutmodules+=" tpm2-tss "
|
dracutmodules+=" tpm2-tss "
|
||||||
EOF
|
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 "
|
dracutmodules+=" kernel-modules dracut-systemd systemd-initrd base "
|
||||||
EOF
|
EOF
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@
|
||||||
postprocess:
|
postprocess:
|
||||||
- | #!/bin/bash
|
- | #!/bin/bash
|
||||||
mkdir -p /usr/lib/systemd/journald.conf.d/
|
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]
|
[Journal]
|
||||||
Storage=persistent
|
Storage=persistent
|
||||||
EOF
|
EOF
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue