Skip to content

Commit

Permalink
containers/ws: Fix pulling in packages from COPR
Browse files Browse the repository at this point in the history
Commit 76da7b7 broke building the official container against COPR:
`dnf --installroot` only considers the repos in the target tree, not on
the host. So create cockpit.repo in /build.
  • Loading branch information
martinpitt committed Jun 28, 2022
1 parent 8898cef commit 9437593
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion containers/ws/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ if [ -n "$rpm" ]; then
$INSTALL /container/rpms/cockpit-ws-*$OSVER.*$arch.rpm /container/rpms/cockpit-bridge-*$OSVER.*$arch.rpm
else
# pull packages from https://copr.fedorainfracloud.org/coprs/g/cockpit/cockpit-preview/
echo -e '[group_cockpit-cockpit-preview]\nname=Copr repo for cockpit-preview owned by @cockpit\nbaseurl=https://copr-be.cloud.fedoraproject.org/results/@cockpit/cockpit-preview/fedora-$releasever-$basearch/\ntype=rpm-md\ngpgcheck=1\ngpgkey=https://copr-be.cloud.fedoraproject.org/results/@cockpit/cockpit-preview/pubkey.gpg\nrepo_gpgcheck=0\nenabled=1\nenabled_metadata=1' > /etc/yum.repos.d/cockpit.repo
echo -e '[group_cockpit-cockpit-preview]\nname=Copr repo for cockpit-preview owned by @cockpit\nbaseurl=https://copr-be.cloud.fedoraproject.org/results/@cockpit/cockpit-preview/fedora-$releasever-$basearch/\ntype=rpm-md\ngpgcheck=1\ngpgkey=https://copr-be.cloud.fedoraproject.org/results/@cockpit/cockpit-preview/pubkey.gpg\nrepo_gpgcheck=0\nenabled=1\nenabled_metadata=1' > /build/etc/yum.repos.d/cockpit.repo
ws=$(package_name "cockpit-ws")
bridge=$(package_name "cockpit-bridge")
$INSTALL "$ws" "$bridge"
Expand Down

0 comments on commit 9437593

Please sign in to comment.