mirror of
https://codeberg.org/hyperreal/vauxite-build
synced 2024-11-01 08:43:13 +01:00
Use Bash heredoc for charm.repo
This commit is contained in:
parent
0df8a00eb2
commit
7f666f6649
@ -22,12 +22,14 @@ fi
|
||||
|
||||
# Ensure gum is installed
|
||||
if ! test -x "$(command -v gum)"; then
|
||||
echo '[charm]
|
||||
name=Charm
|
||||
baseurl=https://repo.charm.sh/yum/
|
||||
enabled=1
|
||||
gpgcheck=1
|
||||
gpgkey=https://repo.charm.sh/yum/gpg.key' | sudo tee /etc/yum.repos.d/charm.repo
|
||||
cat <<EOF > /etc/yum.repos.d/charm.repo
|
||||
[charm]
|
||||
name=Charm
|
||||
baseurl=https://repo.charm.sh/yum/
|
||||
enabled=1
|
||||
gpgcheck=1
|
||||
gpgkey=https://repo.charm.sh/yum/gpg.key
|
||||
EOF
|
||||
dnf install -y gum
|
||||
fi
|
||||
|
||||
@ -104,7 +106,7 @@ fi
|
||||
|
||||
# Compose ostree base image and push to registry
|
||||
log_struc_info "Compose ostree base image and push to registry" treefile "${TREEFILE}" registry "${REGISTRY}"
|
||||
if ! rpm-ostree compose image --cachedir "${CACHE_DIR}" -i --initialize-mode=if-not-exists --format=registry "${TREEFILE}" "${REGISTRY}/fedora-atomic/vauxite-build/vauxite:${RELVER}"; then
|
||||
if ! rpm-ostree compose image --cachedir "${CACHE_DIR}" --initialize-mode=if-not-exists --format=registry "${TREEFILE}" "${REGISTRY}/fedora-atomic/vauxite-build/vauxite:${RELVER}"; then
|
||||
log_struc_error "Error composing ostree and/or pushing to registry" status "$?"
|
||||
exit 1
|
||||
fi
|
||||
|
Loading…
Reference in New Issue
Block a user