Automated update for script library changes

Author: CI

container-templates/docker-compose/.devcontainer/library-scripts/common-debian.sh

@@ -78,6 +78,7 @@ if [ "${PACKAGES_ALREADY_INSTALLED}" != "true" ]; then
     package_list="apt-utils \
         openssh-client \
         gnupg2 \
+        dirmngr \
         iproute2 \
         procps \
         lsof \

container-templates/dockerfile/.devcontainer/library-scripts/common-debian.sh

@@ -78,6 +78,7 @@ if [ "${PACKAGES_ALREADY_INSTALLED}" != "true" ]; then
     package_list="apt-utils \
         openssh-client \
         gnupg2 \
+        dirmngr \
         iproute2 \
         procps \
         lsof \

containers/alpine/.devcontainer/library-scripts/common-alpine.sh

@@ -58,7 +58,7 @@ export DEBIAN_FRONTEND=noninteractive
 architecture="$(dpkg --print-architecture)"
 if [ "${architecture}" = "amd64" ]; then
     # Install dependencies
-    check_packages apt-transport-https curl ca-certificates gnupg2
+    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

containers/azure-ansible/.devcontainer/library-scripts/azcli-debian.sh

@@ -78,6 +78,7 @@ if [ "${PACKAGES_ALREADY_INSTALLED}" != "true" ]; then
     package_list="apt-utils \
         openssh-client \
         gnupg2 \
+        dirmngr \
         iproute2 \
         procps \
         lsof \

containers/azure-ansible/.devcontainer/library-scripts/common-debian.sh

@@ -78,9 +78,10 @@ check_packages() {
 export DEBIAN_FRONTEND=noninteractive
 
 # Install dependencies
-check_packages apt-transport-https curl ca-certificates gnupg2
+check_packages apt-transport-https curl ca-certificates gnupg2 dirmngr
 
 # Install Docker / Moby CLI if not already installed
+architecture="$(dpkg --print-architecture)"
 if type docker > /dev/null 2>&1; then
     echo "Docker / Moby CLI already installed."
 else
@@ -90,9 +91,10 @@ else
         # Import key safely (new 'signed-by' method rather than deprecated apt-key approach) and install
         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=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/microsoft-archive-keyring.gpg] https://packages.microsoft.com/repos/microsoft-${ID}-${VERSION_CODENAME}-prod ${VERSION_CODENAME} main" > /etc/apt/sources.list.d/microsoft.list
+        echo "deb [arch=${architecture} signed-by=/usr/share/keyrings/microsoft-archive-keyring.gpg] https://packages.microsoft.com/repos/microsoft-${ID}-${VERSION_CODENAME}-prod ${VERSION_CODENAME} main" > /etc/apt/sources.list.d/microsoft.list
         apt-get update
-        apt-get -y install --no-install-recommends moby-cli moby-buildx moby-compose
+        apt-get -y install --no-install-recommends moby-cli moby-buildx moby-engine
+        apt-get -y install --no-install-recommends moby-compose || echo "(*) Package moby-compose (Docker Compose v2) not available for ${VERSION_CODENAME} ${architecture}. Skipping."
     else
         # Import key safely (new 'signed-by' method rather than deprecated apt-key approach) and install
         curl -fsSL https://download.docker.com/linux/${ID}/gpg | gpg --dearmor > /usr/share/keyrings/docker-archive-keyring.gpg

containers/azure-ansible/.devcontainer/library-scripts/docker-debian.sh

@@ -48,8 +48,10 @@ fi
 updaterc() {
     if [ "${UPDATE_RC}" = "true" ]; then
         echo "Updating /etc/bash.bashrc and /etc/zsh/zshrc..."
-        echo -e "$1" >> /etc/bash.bashrc
-        if [ -f "/etc/zsh/zshrc" ]; then
+        if [[ "$(cat /etc/bash.bashrc)" != *"$1"* ]]; then
+            echo -e "$1" >> /etc/bash.bashrc
+        fi
+        if [ -f "/etc/zsh/zshrc" ] && [[ "$(cat /etc/zsh/zshrc)" != *"$1"* ]]; then
             echo -e "$1" >> /etc/zsh/zshrc
         fi
     fi
@@ -78,7 +80,7 @@ check_packages() {
 export DEBIAN_FRONTEND=noninteractive
 
 # Install dependencies
-check_packages apt-transport-https curl ca-certificates tar gnupg2
+check_packages apt-transport-https curl ca-certificates tar gnupg2 dirmngr
 
 # Install yarn
 if type yarn > /dev/null 2>&1; then

containers/azure-ansible/.devcontainer/library-scripts/node-debian.sh

@@ -58,7 +58,7 @@ export DEBIAN_FRONTEND=noninteractive
 architecture="$(dpkg --print-architecture)"
 if [ "${architecture}" = "amd64" ]; then
     # Install dependencies
-    check_packages apt-transport-https curl ca-certificates gnupg2
+    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

containers/azure-bicep/.devcontainer/library-scripts/azcli-debian.sh

@@ -78,6 +78,7 @@ if [ "${PACKAGES_ALREADY_INSTALLED}" != "true" ]; then
     package_list="apt-utils \
         openssh-client \
         gnupg2 \
+        dirmngr \
         iproute2 \
         procps \
         lsof \

containers/azure-bicep/.devcontainer/library-scripts/common-debian.sh

@@ -48,8 +48,10 @@ fi
 updaterc() {
     if [ "${UPDATE_RC}" = "true" ]; then
         echo "Updating /etc/bash.bashrc and /etc/zsh/zshrc..."
-        echo -e "$1" >> /etc/bash.bashrc
-        if [ -f "/etc/zsh/zshrc" ]; then
+        if [[ "$(cat /etc/bash.bashrc)" != *"$1"* ]]; then
+            echo -e "$1" >> /etc/bash.bashrc
+        fi
+        if [ -f "/etc/zsh/zshrc" ] && [[ "$(cat /etc/zsh/zshrc)" != *"$1"* ]]; then
             echo -e "$1" >> /etc/zsh/zshrc
         fi
     fi
@@ -78,7 +80,7 @@ check_packages() {
 export DEBIAN_FRONTEND=noninteractive
 
 # Install dependencies
-check_packages apt-transport-https curl ca-certificates tar gnupg2
+check_packages apt-transport-https curl ca-certificates tar gnupg2 dirmngr
 
 # Install yarn
 if type yarn > /dev/null 2>&1; then