Skip to content

Commit

Permalink
Packit: New workflow for downstream Fedora and CentOS Stream 10
Browse files Browse the repository at this point in the history
This commit enables:
- upstream copr build jobs on PRs
- rpm builds on podman-next copr after every commit to main
- Fedora and CentOS Stream 10 downstream update jobs on every upstream
  release
- Fetch RPM-GPG-KEY-redhat-release from https://access.redhat.com/security/data/fd431d51.txt

Before an upstream release is cut, `rpm/containers-common.spec` will
need to be updated with the correct release tag of c/image, c/storage
and c/shortnames so that the right configs and docs are fetched.

Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
  • Loading branch information
lsm5 committed Apr 26, 2024
1 parent 61ac430 commit 594d382
Show file tree
Hide file tree
Showing 6 changed files with 329 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .codespellrc
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
skip = ./vendor,./.git #,bin,vendor,.git,go.sum,changelog.txt,.cirrus.yml,"RELEASE_NOTES.md,*.xz,*.gz,*.tar,*.tgz,bin2img,*ico,*.png,*.1,*.5,copyimg,*.orig,apidoc.go"

# Comma separated list of words to be ignored. Words must be lowercased.
ignore-words-list = clos,creat,ro,hastable,shouldnot,mountns
ignore-words-list = clos,creat,ro,hastable,shouldnot,mountns,passt

# Custom dictionary file that contains spelling corrections.
# Run with option '--dictionary=-' to include also default dictionary.
Expand Down
82 changes: 82 additions & 0 deletions .packit.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
---
# See the documentation for more information:
# https://packit.dev/docs/configuration/

downstream_package_name: containers-common
upstream_tag_template: v{version}

packages:
containers-common-fedora:
pkg_tool: fedpkg
specfile_path: rpm/containers-common.spec
containers-common-centos:
pkg_tool: centpkg
specfile_path: rpm/containers-common.spec

actions:
pre-sync: "bash rpm/update-lib-versions.sh"

jobs:
- job: copr_build
trigger: pull_request
packages: [containers-common-fedora]
notifications: &ephemeral_build_failure_notification
failure_comment:
message: "Ephemeral COPR build failed. @containers/packit-build please check."
enable_net: true
targets:
fedora-development: {}
fedora-latest: {}
fedora-eln:
# Need this to fetch go-md2man which is present in koji envs but not by
# default on copr envs. Also helps to avoid bundling go-md2man in
# c/common.
additional_repos:
- https://kojipkgs.fedoraproject.org/repos/eln-build/latest/x86_64/

- job: copr_build
trigger: pull_request
packages: [containers-common-centos]
notifications: *ephemeral_build_failure_notification
enable_net: true
targets:
- epel-9
- centos-stream-10

# Run on commit to main branch
- job: copr_build
trigger: commit
notifications:
failure_comment:
message: "containers-common-next COPR build failed. @containers/packit-build please check."
branch: main
owner: rhcontainerbot
project: containers-common-next
enable_net: true

- job: propose_downstream
trigger: release
update_release: false
packages: [containers-common-fedora]
dist_git_branches:
- fedora-development
- fedora-latest

- job: propose_downstream
trigger: release
update_release: false
packages: [containers-common-centos]
dist_git_branches:
- c10s

- job: koji_build
trigger: commit
packages: [containers-common-fedora]
dist_git_branches:
- fedora-all

- job: bodhi_update
trigger: commit
packages: [containers-common-fedora]
dist_git_branches:
- fedora-branched # rawhide updates are created automatically
3 changes: 3 additions & 0 deletions contrib/redhat/registry.access.redhat.com.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
docker:
registry.access.redhat.com:
sigstore: https://access.redhat.com/webassets/docker/content/sigstore
3 changes: 3 additions & 0 deletions contrib/redhat/registry.redhat.io.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
docker:
registry.redhat.io:
sigstore: https://registry.redhat.io/containers/sigstore
227 changes: 227 additions & 0 deletions rpm/containers-common.spec
Original file line number Diff line number Diff line change
@@ -0,0 +1,227 @@
# Below definitions are used to deliver config files from a particular branch
# of c/image, c/storage and c/shortnames vendored in all of Buildah, Podman and Skopeo.
# These vendored components must have the same version. If it is not the case,
# pick the oldest version on c/image, c/storage and c/shortnames vendored in
# Buildah/Podman/Skopeo.

# Replace `main` below with upstream version tags before cutting a new release of c/common
%global image_branch main
%global storage_branch main
%global shortnames_branch main

%global github_containers https://raw.githubusercontent.com/containers

%if %{defined copr_username}
%define copr_build 1
%endif

Name: containers-common
%if %{defined copr_build}
Epoch: 102
%else
Epoch: 5
%endif
# DO NOT TOUCH the Version string!
# The TRUE source of this specfile is:
# https://github.com/containers/common/blob/main/rpm/containers-common.spec
# If that's what you're reading, Version must be 0, and will be updated by Packit for
# copr and koji builds.
# If you're reading this on dist-git, the version is automatically filled in by Packit.
Version: 0
Release: %autorelease
License: Apache-2.0
BuildArch: noarch
# for BuildRequires: go-md2man
ExclusiveArch: %{golang_arches} noarch
Summary: Common configuration and documentation for containers
BuildRequires: git-core
BuildRequires: go-md2man
Provides: skopeo-containers = %{epoch}:%{version}-%{release}
Requires: (container-selinux >= 2:2.162.1 if selinux-policy)
Suggests: fuse-overlayfs
Source0: %{git0}/archive/v%{version_no_tilde}.tar.gz
Source1: %{github_containers}/image/%{image_branch}/docs/containers-auth.json.5.md
Source2: %{github_containers}/image/%{image_branch}/docs/containers-certs.d.5.md
Source3: %{github_containers}/image/%{image_branch}/docs/containers-policy.json.5.md
Source4: %{github_containers}/image/%{image_branch}/docs/containers-registries.conf.5.md
Source5: %{github_containers}/image/%{image_branch}/docs/containers-registries.conf.d.5.md
Source6: %{github_containers}/image/%{image_branch}/docs/containers-registries.d.5.md
Source7: %{github_containers}/image/%{image_branch}/docs/containers-signature.5.md
Source8: %{github_containers}/image/%{image_branch}/docs/containers-transports.5.md
Source9: %{github_containers}/image/%{image_branch}/registries.conf
Source10: %{github_containers}/shortnames/%{shortnames_branch}/shortnames.conf
Source11: %{github_containers}/image/%{image_branch}/default.yaml
Source12: %{github_containers}/image/%{image_branch}/default-policy.json
Source13: %{github_containers}/storage/%{storage_branch}/docs/containers-storage.conf.5.md
Source14: %{github_containers}/storage/%{storage_branch}/storage.conf
# Fetch RPM-GPG-KEY-redhat-release from the authoritative source instead of storing
# a copy in repo or dist-git. Depending on distribution-gpg-keys rpm is also
# not an option because that package doesn't exist on CentOS Stream.
Source15: https://access.redhat.com/security/data/fd431d51.txt

%description
This package contains common configuration files and documentation for container
tools ecosystem, such as Podman, Buildah and Skopeo.

It is required because the most of configuration files and docs come from projects
which are vendored into Podman, Buildah, Skopeo, etc. but they are not packaged
separately.

%package extra
Summary: Extra dependencies for Podman and Buildah
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: container-network-stack
Requires: oci-runtime
Conflicts: podman < 5:5.0.0~rc4-1
Recommends: crun
Recommends: composefs
Requires: (crun if fedora-release-identity-server)
Requires: netavark >= 1.10.3-1
Suggests: slirp4netns
Requires: passt
Requires: iptables
Requires: nftables
Recommends: qemu-user-static
Requires: (qemu-user-static-aarch64 if fedora-release-identity-server)
Requires: (qemu-user-static-arm if fedora-release-identity-server)
Requires: (qemu-user-static-x86 if fedora-release-identity-server)

%description extra
This subpackage will handle dependencies common to Podman and Buildah which are
not required by Skopeo.

%prep
%autosetup -Sgit %{name}-%{version_no_tilde}
cp %{SOURCE1} docs/.
cp %{SOURCE2} docs/.
cp %{SOURCE3} docs/.
cp %{SOURCE4} docs/.
cp %{SOURCE5} docs/.
cp %{SOURCE6} docs/.
cp %{SOURCE7} docs/.
cp %{SOURCE8} docs/.
cp %{SOURCE9} .
cp %{SOURCE10} 000-shortnames.conf
cp %{SOURCE11} .
cp %{SOURCE12} policy.json
cp %{SOURCE13} .
cp %{SOURCE14} .
cp %{SOURCE15} RPM-GPG-KEY-redhat-release

# Patch storage.conf
sed -i -e 's/^driver.*=.*/driver = "overlay"/' -e 's/^mountopt.*=.*/mountopt = "nodev,metacopy=on"/' \
-e '/additionalimage.*/a "/usr/lib/containers/storage",' \
%if %{defined copr_build} || (%{defined fedora} && 0%{?fedora} > 40)
-e 's/^pull_options.*=.*/pull_options = {enable_partial_images = \"true\", use_hard_links = \"false\", ostree_repos="", convert_images = "false"}/' \
-e 's/# use_composefs.*/use_composefs = "false"/g' \
%endif
storage.conf

# Patch seccomp.json
[ `grep "keyctl" pkg/seccomp/seccomp.json | wc -l` == 0 ] && sed -i '/\"kill\",/i \
"keyctl",' pkg/seccomp/seccomp.json
sed -i '/\"socketcall\",/i \
"socket",' pkg/seccomp/seccomp.json

# Patch registries.conf
sed -i 's/^#.*unqualified-search-registries.*=.*/unqualified-search-registries = ["registry.fedoraproject.org", "registry.access.redhat.com", "docker.io"]/g' \
registries.conf
grep '^short-name-mode="enforcing"' registries.conf || echo -e '\nshort-name-mode="enforcing"' >> registries.conf

# Patch containers.conf
sed -i -e 's/^#.*log_driver.*=.*/log_driver = "journald"/' \
-e 's/^#.*compression_format.*=.*/compression_format = "zstd:chunked"/' \
pkg/config/containers.conf

%build
mkdir -p man5
for FILE in $(ls docs/*.5.md); do
go-md2man -in $FILE -out man5/$(basename $FILE .md)
done

cp man5/containerignore.5 man5/.containerignore.5

%install
# install config and policy files for registries
install -dp %{buildroot}%{_sysconfdir}/containers/{certs.d,oci/hooks.d,systemd}
install -dp %{buildroot}%{_sharedstatedir}/containers/sigstore
install -dp %{buildroot}%{_datadir}/containers/systemd
install -dp %{buildroot}%{_prefix}/lib/containers/storage
install -dp -m 700 %{buildroot}%{_prefix}/lib/containers/storage/overlay-images
touch %{buildroot}%{_prefix}/lib/containers/storage/overlay-images/images.lock
install -dp -m 700 %{buildroot}%{_prefix}/lib/containers/storage/overlay-layers
touch %{buildroot}%{_prefix}/lib/containers/storage/overlay-layers/layers.lock

install -Dp -m0644 default.yaml -t %{buildroot}%{_sysconfdir}/containers/registries.d
install -Dp -m0644 storage.conf -t %{buildroot}%{_datadir}/containers
install -Dp -m0644 registries.conf -t %{buildroot}%{_sysconfdir}/containers
install -Dp -m0644 000-shortnames.conf -t %{buildroot}%{_sysconfdir}/containers/registries.conf.d
install -Dp -m0644 policy.json -t %{buildroot}%{_sysconfdir}/containers
# RPM-GPG-KEY-redhat-release already exists on rhel envs, install only on
# fedora and centos
%if 0%{?fedora} || 0%{?centos}
install -Dp -m0644 RPM-GPG-KEY-redhat-release -t %{buildroot}%{_sysconfdir}/pki/rpm-gpg
%endif
install -Dp -m0644 contrib/redhat/registry.access.redhat.com.yaml -t %{buildroot}%{_sysconfdir}/containers/registries.d
install -Dp -m0644 contrib/redhat/registry.redhat.io.yaml -t %{buildroot}%{_sysconfdir}/containers/registries.d

# install manpages
for FILE in $(ls -a man5 | grep 5); do
install -Dp -m0644 man5/$FILE -t %{buildroot}%{_mandir}/man5
done

# install config files for mounts, containers and seccomp
install -m0644 pkg/subscriptions/mounts.conf %{buildroot}%{_datadir}/containers/mounts.conf
install -m0644 pkg/seccomp/seccomp.json %{buildroot}%{_datadir}/containers/seccomp.json
install -m0644 pkg/config/containers.conf %{buildroot}%{_datadir}/containers/containers.conf

# install secrets patch directory
install -d -p -m 755 %{buildroot}/%{_datadir}/rhel/secrets
# rhbz#1110876 - update symlinks for subscription management
ln -s ../../../..%{_sysconfdir}/pki/entitlement %{buildroot}%{_datadir}/rhel/secrets/etc-pki-entitlement
ln -s ../../../..%{_sysconfdir}/rhsm %{buildroot}%{_datadir}/rhel/secrets/rhsm
ln -s ../../../..%{_sysconfdir}/yum.repos.d/redhat.repo %{buildroot}%{_datadir}/rhel/secrets/redhat.repo

%files
%dir %{_sysconfdir}/containers
%dir %{_sysconfdir}/containers/certs.d
%dir %{_sysconfdir}/containers/oci
%dir %{_sysconfdir}/containers/oci/hooks.d
%dir %{_sysconfdir}/containers/registries.conf.d
%dir %{_sysconfdir}/containers/registries.d
%dir %{_sysconfdir}/containers/systemd
%dir %{_prefix}/lib/containers/storage
%dir %{_prefix}/lib/containers/storage/overlay-images
%dir %{_prefix}/lib/containers/storage/overlay-layers
%{_prefix}/lib/containers/storage/overlay-images/images.lock
%{_prefix}/lib/containers/storage/overlay-layers/layers.lock

%config(noreplace) %{_sysconfdir}/containers/policy.json
%config(noreplace) %{_sysconfdir}/containers/registries.conf
%config(noreplace) %{_sysconfdir}/containers/registries.conf.d/000-shortnames.conf
%if 0%{?fedora} || 0%{?centos}
%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
%endif
%config(noreplace) %{_sysconfdir}/containers/registries.d/default.yaml
%{_sysconfdir}/containers/registries.d/registry.redhat.io.yaml
%{_sysconfdir}/containers/registries.d/registry.access.redhat.com.yaml
%ghost %{_sysconfdir}/containers/storage.conf
%ghost %{_sysconfdir}/containers/containers.conf
%dir %{_sharedstatedir}/containers/sigstore
%{_mandir}/man5/Containerfile.5.gz
%{_mandir}/man5/containerignore.5.gz
%{_mandir}/man5/.containerignore.5.gz
%{_mandir}/man5/containers*.5.gz
%dir %{_datadir}/containers
%dir %{_datadir}/containers/systemd
%{_datadir}/containers/storage.conf
%{_datadir}/containers/containers.conf
%{_datadir}/containers/mounts.conf
%{_datadir}/containers/seccomp.json
%dir %{_datadir}/rhel/secrets
%{_datadir}/rhel/secrets/*

%files extra

%changelog
%autochangelog
13 changes: 13 additions & 0 deletions rpm/update-lib-versions.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#!/usr/bin/env bash

set -exo pipefail

SPECFILE=rpm/containers-common.spec

# Fetch versions from go.mod
IMAGE_VERSION=$(awk '/github.com\/containers\/image/ {print $2}' go.mod)
STORAGE_VERSION=$(awk '/github.com\/containers\/storage/ {print $2}' go.mod)

# Update versions in rpm spec
sed -i "s/^%global image_branch main/%global image_branch $IMAGE_VERSION/" $SPECFILE
sed -i "s/^%global storage_branch main/%global storage_branch $STORAGE_VERSION/" $SPECFILE

0 comments on commit 594d382

Please sign in to comment.