Use rootful container for testing

This commit is contained in:
2025-04-24 10:33:17 -04:00
parent c8ab117feb
commit 1b0802c5e8

View File

@@ -420,7 +420,7 @@ get_latest_mc_version() {
# Use generalized containerized package manager to determine latest MC version # Use generalized containerized package manager to determine latest MC version
if install_package --silent buildah && if install_package --silent buildah &&
cnt=$(sudo buildah from --quiet alpine:edge 2>/dev/null) && cnt=$(sudo buildah from --quiet alpine:edge 2>/dev/null) &&
execute sudo buildah run "$cnt" -- sh -c ' sudo buildah run "$cnt" -- sh -c '
apk add --no-cache apt curl gnupg &>/dev/null apk add --no-cache apt curl gnupg &>/dev/null
curl -fsSL https://dist.jriver.com/mediacenter@jriver.com.gpg.key | gpg --dearmor -o /usr/share/keyrings/jriver-com-archive-keyring.gpg curl -fsSL https://dist.jriver.com/mediacenter@jriver.com.gpg.key | gpg --dearmor -o /usr/share/keyrings/jriver-com-archive-keyring.gpg
cat <<-EOF > /etc/apt/sources.list.d/jriver.sources cat <<-EOF > /etc/apt/sources.list.d/jriver.sources
@@ -432,6 +432,7 @@ get_latest_mc_version() {
Architectures: '"$MC_ARCH"' Architectures: '"$MC_ARCH"'
EOF EOF
apt-get update --allow-insecure-repositories' && apt-get update --allow-insecure-repositories' &&
echo "MC_MVERSION=$MC_MVERSION" &&
MC_VERSION=$(sudo buildah run "$cnt" -- apt-cache policy "mediacenter$MC_MVERSION" | grep Candidate | awk '{print $2}' | sort -V | tail -n1) && MC_VERSION=$(sudo buildah run "$cnt" -- apt-cache policy "mediacenter$MC_MVERSION" | grep Candidate | awk '{print $2}' | sort -V | tail -n1) &&
echo "MC_VERSION: $MC_VERSION" && echo "MC_VERSION: $MC_VERSION" &&
[[ $MC_VERSION =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then [[ $MC_VERSION =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then