|
|
@@ -1840,11 +1840,10 @@ create_mc_apt_container() {
|
|
|
declare -g CNT
|
|
|
local -a cmds=("$@")
|
|
|
{ command -v buildah &>/dev/null || install_package buildah &>/dev/null; } &&
|
|
|
- echo HERE &&
|
|
|
CNT=$(sudo buildah from --quiet alpine:edge) &&
|
|
|
sudo buildah run "$CNT" -- sh -c '
|
|
|
- apk add --no-cache apt curl gnupg &&
|
|
|
- curl -fsSL https://dist.jriver.com/mediacenter@jriver.com.gpg.key | gpg --dearmor -o /usr/share/keyrings/jriver-com-archive-keyring.gpg &&
|
|
|
+ apk add --no-cache apt curl gnupg
|
|
|
+ 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
|
|
|
Types: deb
|
|
|
URIs: https://dist.jriver.com/latest/mediacenter/
|
|
|
@@ -1852,8 +1851,8 @@ create_mc_apt_container() {
|
|
|
Suites: '"$MC_REPO"'
|
|
|
Components: main
|
|
|
Architectures: '"$MC_ARCH"'
|
|
|
- EOF &&
|
|
|
- apt-get update --allow-insecure-repositories' &&
|
|
|
+ EOF
|
|
|
+ apt-get update --allow-insecure-repositories'
|
|
|
# If user passes command strings run them in the container
|
|
|
for cmd in "${cmds[@]}"; do
|
|
|
sudo buildah run "$CNT" -- sh -c "$cmd"
|
