diff --git a/README.md b/README.md index 331695c..7b96706 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ via `rpm-ostree compose image`. Here's an example command: ``` -$ sudo rpm-ostree compose image --authfile ~/.config/containers/myquay.json --cachedir=cache -i --format=registry oscore/manifest.yaml quay.io/cgwalters/fedora-oscore +$ sudo rpm-ostree compose image --authfile ~/.config/containers/myquay.json --cachedir=cache -i --format=registry fedora.yaml quay.io/cgwalters/fedora-oscore ``` More information at https://coreos.github.io/rpm-ostree/container/ diff --git a/c9s.repo b/c9s.repo new file mode 100644 index 0000000..e34160b --- /dev/null +++ b/c9s.repo @@ -0,0 +1,55 @@ +[baseos] +name=CentOS Stream 9 - BaseOS +baseurl=http://mirror.stream.centos.org/9-stream/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=http://mirror.stream.centos.org/9-stream/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=http://mirror.stream.centos.org/9-stream/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=http://mirror.stream.centos.org/9-stream/RT/$basearch/os +gpgcheck=1 +repo_gpgcheck=0 +enabled=1 +gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official + +[sig-nfv] +name=CentOS Stream 9 - SIG NFV +baseurl=http://mirror.stream.centos.org/SIGs/9-stream/nfv/$basearch/openvswitch-2/ +gpgcheck=1 +repo_gpgcheck=0 +enabled=1 +gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-SIG-NFV + +[sig-virtualization] +name=CentOS Stream 9 - SIG Virtualization +baseurl=http://mirror.stream.centos.org/SIGs/9-stream/virt/x86_64/kata-containers/ +gpgcheck=1 +repo_gpgcheck=0 +enabled=1 +gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-SIG-Virtualization + +[okd-copr] +name=OKD COPR +baseurl=https://download.copr.fedorainfracloud.org/results/@OKD/okd/centos-stream-9-$basearch/ +gpgcheck=1 +repo_gpgcheck=0 +enabled=1 +gpgkey=https://download.copr.fedorainfracloud.org/results/@OKD/okd/pubkey.gpg diff --git a/c9s.yaml b/c9s.yaml new file mode 100644 index 0000000..aa73fd4 --- /dev/null +++ b/c9s.yaml @@ -0,0 +1,12 @@ +releasever: stream9 + +repos: + - baseos + - appstream + +metadata: + name: c9s-oscore + summary: CentOS 9 OSCore + +include: + - oscore/manifest.yaml diff --git a/oscore/fedora-next.repo b/fedora-next.repo similarity index 100% rename from oscore/fedora-next.repo rename to fedora-next.repo diff --git a/oscore/fedora-rawhide.repo b/fedora-rawhide.repo similarity index 100% rename from oscore/fedora-rawhide.repo rename to fedora-rawhide.repo diff --git a/oscore/fedora.repo b/fedora.repo similarity index 100% rename from oscore/fedora.repo rename to fedora.repo diff --git a/fedora.yaml b/fedora.yaml new file mode 100644 index 0000000..caa8f58 --- /dev/null +++ b/fedora.yaml @@ -0,0 +1,28 @@ +releasever: 37 + +repos: + - fedora + - fedora-updates + +metadata: + name: fedora-oscore + summary: Fedora OSCore + +include: + - oscore/manifest.yaml + +packages: + # We include this for historical reasons + - fedora-repos-ostree + # fedora-repos-modular was converted into its own subpackage in f33 + # Continue to include it in case users want to use it. + - fedora-repos-modular + # file-transfer: note fuse-sshfs is not in RHEL + # so we can't put it in file-transfer.yaml + - fuse-sshfs + # Storage + - btrfs-progs + # In F35+ need `iptables-legacy` package + # See https://github.com/coreos/fedora-coreos-tracker/issues/676#issuecomment-928028451 + - iptables-legacy + - nano-default-editor \ No newline at end of file diff --git a/oscore/manifest.yaml b/oscore/manifest.yaml index 334e831..86f1c5d 100644 --- a/oscore/manifest.yaml +++ b/oscore/manifest.yaml @@ -1,12 +1,3 @@ -releasever: 37 - -repos: - - fedora - - fedora-updates - -metadata: - name: fedora-oscore - summary: Fedora OSCore # Modern defaults we want boot-location: modules @@ -63,13 +54,8 @@ automatic-version-prefix: "${releasever}." mutate-os-release: "${releasever}" packages: - # We include this for historical reasons - - fedora-repos-ostree - # fedora-repos-modular was converted into its own subpackage in f33 - # Continue to include it in case users want to use it. - - fedora-repos-modular # Include and set the default editor - - nano nano-default-editor + - nano # Security - polkit # Containers @@ -101,8 +87,6 @@ packages: - iptables-nft iptables-services # WireGuard https://github.com/coreos/fedora-coreos-tracker/issues/362 - wireguard-tools - # Storage - - btrfs-progs - WALinuxAgent-udev # Allow communication between sudo and SSSD # for caching sudo rules by SSSD. @@ -116,9 +100,6 @@ packages: - lsof # Provides terminal tools like clear, reset, tput, and tset - ncurses - # file-transfer: note fuse-sshfs is not in RHEL - # so we can't put it in file-transfer.yaml - - fuse-sshfs # Improved MOTD experience - console-login-helper-messages-motdgen # i18n @@ -128,9 +109,6 @@ packages: - zram-generator # resolved was broken out to its own package in rawhide/f35 - systemd-resolved - # In F35+ need `iptables-legacy` package - # See https://github.com/coreos/fedora-coreos-tracker/issues/676#issuecomment-928028451 - - iptables-legacy # Include the qemu-user-static-x86 package on aarch64 and s390x FCOS images # to allow access to the large inventory of containers only built for x86_64. @@ -181,11 +159,6 @@ postprocess: # have recommends: false so these could only come in via # hard requirement, in which case the build will fail. exclude-packages: - - python - - python2 - - python2-libs - - python3 - - python3-libs - perl - perl-interpreter - nodejs