Merge branch 'container-use-dev' into 'main'
container: Use copr rpm-ostree by default See merge request fedora/bootc/base-images!104
This commit is contained in:
commit
582f7efb8c
2 changed files with 11 additions and 2 deletions
|
|
@ -6,11 +6,19 @@
|
|||
# to run the "rechunker" on the output of this build, see
|
||||
# https://coreos.github.io/rpm-ostree/experimental-build-chunked-oci/
|
||||
|
||||
# Override this repos container to control the base image package versions. For
|
||||
# example, podman build --from=quay.io/fedora/fedora:41 will get you a system
|
||||
# that uses Fedora 41 packages. Or inject arbitrary yum repos (COPR, etc) here.
|
||||
FROM quay.io/fedora/fedora:rawhide as repos
|
||||
|
||||
# BOOTSTRAPPING: This can be any image that has rpm-ostree and selinux-policy-targeted.
|
||||
FROM quay.io/fedora/fedora:rawhide as builder
|
||||
RUN dnf -y install rpm-ostree selinux-policy-targeted
|
||||
FROM quay.io/fedora/fedora:41 as builder
|
||||
# However we also pull rpm-ostree from git main to get some fixes for now
|
||||
RUN <<EORUN
|
||||
set -xeuo pipefail
|
||||
curl -L --fail -o /etc/yum.repos.d/continuous.repo https://copr.fedorainfracloud.org/coprs/g/CoreOS/continuous/repo/fedora-41/group_CoreOS-continuous-fedora-41.repo
|
||||
dnf -y install rpm-ostree selinux-policy-targeted
|
||||
EORUN
|
||||
ARG MANIFEST=fedora-standard
|
||||
# The input git repository has .repo files committed to git rpm-ostree has historically
|
||||
# emphasized that. But here, we are fetching the repos from the container base image.
|
||||
|
|
|
|||
|
|
@ -4,3 +4,4 @@ set -xeuo pipefail
|
|||
ln -s ../run var/run
|
||||
# https://gitlab.com/fedora/bootc/tracker/-/issues/58
|
||||
mkdir -p var/lib/rpm-state
|
||||
test -d var/tmp || mkdir -m 1777 var/tmp
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue