Add, fix fallback logic

Author: Chuxel

script-library/azcli-debian.sh

@@ -12,6 +12,8 @@
 set -e
 
 MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"
+AZCLI_ARCHIVE_ARCHITECTURES="amd64"
+AZCLI_ARCHIVE_VERSION_CODENAMES="stretch buster bullseye bionic focal"
 
 if [ "$(id -u)" -ne 0 ]; then
     echo -e 'Script must be run as root. Use sudo, su, or add "USER root" to your Dockerfile before running this script.'
@@ -54,20 +56,21 @@ check_packages() {
 
 export DEBIAN_FRONTEND=noninteractive
 
-# See if we're on x86_64 and if so, install via apt-get, otherwise use pip3
-architecture="$(dpkg --print-architecture)"
-if [ "${architecture}" = "amd64" ]; then
+install_using_apt() {
     # Install dependencies
     check_packages apt-transport-https curl ca-certificates gnupg2 dirmngr
     # Import key safely (new 'signed-by' method rather than deprecated apt-key approach) and install
-    . /etc/os-release
     get_common_setting MICROSOFT_GPG_KEYS_URI
     curl -sSL ${MICROSOFT_GPG_KEYS_URI} | gpg --dearmor > /usr/share/keyrings/microsoft-archive-keyring.gpg
     echo "deb [arch=${architecture} signed-by=/usr/share/keyrings/microsoft-archive-keyring.gpg] https://packages.microsoft.com/repos/azure-cli/ ${VERSION_CODENAME} main" > /etc/apt/sources.list.d/azure-cli.list
-    apt-get update
-    apt-get install -y azure-cli
-else
-    echo "No pre-built binaries availabe for ${architecture}. Installing via pip3."
+    if ! apt-get update && apt-get install -yq azure-cli; then
+        -f /etc/apt/sources.list.d/azure-cli.list
+        return 1
+    fi
+}
+
+install_using_pip() {
+    echo "(*) No pre-built binaries availabe for ${architecture}. Installing via pip3."
     if ! dpkg -s python3-minimal python3-pip libffi-dev python3-venv > /dev/null 2>&1; then
         apt_get_update_if_needed
         apt-get -y install python3-minimal python3-pip libffi-dev python3-venv
@@ -84,5 +87,20 @@ else
     fi
     ${pipx_bin} install --system-site-packages --pip-args '--no-cache-dir --force-reinstall' azure-cli
     rm -rf /tmp/pip-tmp
+}
+
+# See if we're on x86_64 and if so, install via apt-get, otherwise use pip3
+echo "(*) Installing Azure CLI..."
+. /etc/os-release
+architecture="$(dpkg --print-architecture)"
+if [[ "${AZCLI_ARCHIVE_ARCHITECTURES}" = *"${architecture}"* ]] && [[  "${AZCLI_ARCHIVE_VERSION_CODENAMES}" = *"${VERSION_CODENAME}"* ]]; then
+    install_using_apt || use_pip="true"
+else
+    use_pip="true"
 fi
+
+if [ "${use_pip}" = "true" ]; then
+    install_using_pip
+fi
+
 echo "Done!"

script-library/git-lfs-debian.sh

@@ -137,8 +137,13 @@ install_using_apt() {
     get_common_setting GIT_LFS_ARCHIVE_GPG_KEY_URI
     curl -sSL "${GIT_LFS_ARCHIVE_GPG_KEY_URI}" | gpg --dearmor > /usr/share/keyrings/gitlfs-archive-keyring.gpg
     echo -e "deb [arch=${architecture} signed-by=/usr/share/keyrings/gitlfs-archive-keyring.gpg] https://packagecloud.io/github/git-lfs/${ID} ${VERSION_CODENAME} main\ndeb-src [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/gitlfs-archive-keyring.gpg] https://packagecloud.io/github/git-lfs/${ID} ${VERSION_CODENAME} main" > /etc/apt/sources.list.d/git-lfs.list
-    apt-get install -yq git-lfs${version_suffix} || return 1
-    git lfs install --skip-repo
+
+    if ! apt-get update && apt-get install -yq git-lfs${version_suffix}; then
+        rm -f /etc/apt/sources.list.d/git-lfs.list
+        return 1
+    fi
+
+    git-lfs install --skip-repo
 }
 
 install_using_github() {

script-library/shared/settings.env

@@ -10,6 +10,8 @@ GIT_LFS_ARCHIVE_VERSION_CODENAMES="stretch buster bullseye bionic focal"
 GIT_LFS_CHECKSUM_GPG_KEYS="0x88ace9b29196305ba9947552f1ba225c0223b187 0x86cd3297749375bcf8206715f54fe648088335a9 0xaa3b3450295830d2de6db90caba67be5a5795889"
 POWERSHELL_ARCHIVE_ARCHITECTURES="amd64"
 POWERSHELL_ARCHIVE_VERSION_CODENAMES="stretch buster bionic focal"
+AZCLI_ARCHIVE_ARCHITECTURES="amd64"
+AZCLI_ARCHIVE_VERSION_CODENAMES="stretch buster bullseye bionic focal"
 HELM_GPG_KEYS_URI="https://raw.githubusercontent.com/helm/helm/main/KEYS"
 MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"
 TFLINT_GPG_KEY_URI="https://raw.githubusercontent.com/terraform-linters/tflint/master/8CE69160EB3F2FE9.key"