bryan/installJRMC
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use default repo for beta apt

Browse Source
This commit is contained in:
Bryan Roessler
2026-01-15 21:39:38 -05:00
parent 64814842c2
commit 3201b8507f
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
installJRMC
View File

@@ -1996,11 +1996,18 @@ create_mc_apt_container() {
declare -g CNT declare -g CNT
local -a cmds=("$@") local -a cmds=("$@")
local channel="latest" local channel="latest"
[[ -n $BETAPASS ]] && channel="beta" local repo="$MC_REPO"
if [[ -n $BETAPASS ]]; then
debug "Using beta channel for apt container"
channel="beta"
repo="$MC_REPO_HARDCODE"
fi
# shellcheck disable=SC2016 # shellcheck disable=SC2016
{ command -v buildah &>/dev/null || install_package buildah; } && { command -v buildah &>/dev/null || install_package buildah; } &&
CNT=$(buildah from --quiet alpine:edge) && CNT=$(buildah from --quiet alpine:edge) &&
buildah run --env MC_REPO="$MC_REPO" --env MC_ARCH="$MC_ARCH" --env CHANNEL="$channel" "$CNT" -- sh -c ' buildah run --env MC_REPO="$repo" --env MC_ARCH="$MC_ARCH" --env CHANNEL="$channel" "$CNT" -- sh -c '
apk add --quiet --no-progress --no-cache apt curl gnupg apk add --quiet --no-progress --no-cache apt curl gnupg
curl -fsSL https://dist.jriver.com/mediacenter@jriver.com.gpg.key | gpg --quiet --dearmor -o /usr/share/keyrings/jriver-com-archive-keyring.gpg curl -fsSL https://dist.jriver.com/mediacenter@jriver.com.gpg.key | gpg --quiet --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