Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Cameron Meissner committed Mar 14, 2024
1 parent 79ba26e commit ccf7585
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
7 changes: 4 additions & 3 deletions parts/linux/cloud-init/artifacts/ubuntu/cse_install_ubuntu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -248,17 +248,18 @@ ensureRunc() {
RUNC_MANIFEST="$(jq .runc "$MANIFEST_FILEPATH")"
DOWNLOAD_LOCATION="$(echo "$RUNC_MANIFEST" | jq -r .downloadLocation)"
TARGET_VERSION="$(echo "$RUNC_MANIFEST" | jq -r .installed.default)"


HAS_OVERRIDE="$(echo "$RUNC_MANIFEST" | jq 'has("override")')"

CLEANED_UBUNTU_RELEASE=${UBUNTU_RELEASE/./}
if [ "$(echo "$RUNC_MANIFEST" | jq 'has(".${CLEANED_UBUNTU_RELEASE}")')" == "true" ]; then
TARGET_VERSION="$(echo "$RUNC_MANIFEST" | jq -r ."${CLEANED_UBUNTU_RELEASE}")"
if [ "$(echo "$RUNC_MANIFEST" | jq 'has(".installed.${CLEANED_UBUNTU_RELEASE}")')" == "true" ]; then
TARGET_VERSION="$(echo "$RUNC_MANIFEST" | jq -r .installed."${CLEANED_UBUNTU_RELEASE}")"
fi

if [ "$HAS_OVERRIDE" == "true" ]; then
IS_PRIVATE_OVERRIDE="false"
OVERRIDE="$(echo "$RUNC_MANIFEST" | jq .override)"
TARGET_VERSION="$(echo "$OVERRIDE" | jq -r .version)"
if [ "$(echo "$OVERRIDE" | jq -r .privateStorage)" == "true" ]; then
IS_PRIVATE_OVERRIDE="true"
fi
Expand Down
4 changes: 2 additions & 2 deletions schemas/manifest.cue
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
}

#override: {
version?: string // if specified, then implicitly a particular version will be downloaded/installed with apt
downloadURL?: #URL // if a downloadURL is provided, this implictly means that we need to download from somewhere separately instead of installing directly via apt
version?: string // if specified, then a particular version will be downloaded/installed with apt
downloadURL?: #URL // if specified, this implies we need to download from somewhere separately instead of installing directly via apt
privateStorage?: bool // denotes whether we need to fetch from a private storage account using azcopy
}

Expand Down

0 comments on commit ccf7585

Please sign in to comment.