mirror of
https://github.com/opencontainers/runc.git
synced 2026-07-10 21:53:57 +08:00
ci: switch build scripts from wget to curl
runc's build scripts and CI setup used a mix of wget (4 sites) and
curl (8 sites) for HTTPS fetches. Standardise the three script sites on
curl, which is already required by the majority of call sites.
* script/build-libpathrs.sh and script/build-seccomp.sh: replace
wget "<url>"{,.asc} with curl -fsSLO "<url>"{,.asc}. Bash brace
expansion still yields two separate downloads (the tarball and its
.asc signature).
* script/setup_host.sh: replace wget with curl in the Fedora RPM
install list.
Leaving the single wget call in Dockerfile untouched per review
feedback -- the trixie base image already ships wget, and switching
would add an extra apt-get update && install step before the existing
single-pass package install.
Refs #5240
Signed-off-by: Ali <alliasgher123@gmail.com>
This commit is contained in:
@@ -75,7 +75,7 @@ function build_libpathrs() {
|
|||||||
local tar="libpathrs-${ver}.tar.xz"
|
local tar="libpathrs-${ver}.tar.xz"
|
||||||
|
|
||||||
# Download, check, and extract.
|
# Download, check, and extract.
|
||||||
wget "https://github.com/cyphar/libpathrs/releases/download/v${ver}/${tar}"{,.asc}
|
curl -fsSL --remote-name-all "https://github.com/cyphar/libpathrs/releases/download/v${ver}/${tar}"{,.asc}
|
||||||
sha256sum --strict --check - <<<"${LIBPATHRS_SHA256[${ver}]} *${tar}"
|
sha256sum --strict --check - <<<"${LIBPATHRS_SHA256[${ver}]} *${tar}"
|
||||||
|
|
||||||
local srcdir
|
local srcdir
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ function build_libseccomp() {
|
|||||||
local tar="libseccomp-${ver}.tar.gz"
|
local tar="libseccomp-${ver}.tar.gz"
|
||||||
|
|
||||||
# Download, check, and extract.
|
# Download, check, and extract.
|
||||||
wget "https://github.com/seccomp/libseccomp/releases/download/v${ver}/${tar}"{,.asc}
|
curl -fsSL --remote-name-all "https://github.com/seccomp/libseccomp/releases/download/v${ver}/${tar}"{,.asc}
|
||||||
sha256sum --strict --check - <<<"${SECCOMP_SHA256[${ver}]} *${tar}"
|
sha256sum --strict --check - <<<"${SECCOMP_SHA256[${ver}]} *${tar}"
|
||||||
|
|
||||||
local srcdir
|
local srcdir
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ platform:el9 | platform:el10)
|
|||||||
esac
|
esac
|
||||||
|
|
||||||
# Install common packages
|
# Install common packages
|
||||||
RPMS=(cargo container-selinux fuse-sshfs git-core glibc-static golang iptables jq libseccomp-devel lld make policycoreutils wget)
|
RPMS=(cargo container-selinux curl fuse-sshfs git-core glibc-static golang iptables jq libseccomp-devel lld make policycoreutils)
|
||||||
# Work around dnf mirror failures by retrying a few times.
|
# Work around dnf mirror failures by retrying a few times.
|
||||||
for i in $(seq 0 2); do
|
for i in $(seq 0 2); do
|
||||||
sleep "$i"
|
sleep "$i"
|
||||||
|
|||||||
Reference in New Issue
Block a user