Skip to content
This repository was archived by the owner on Nov 30, 2023. It is now read-only.

Commit e6445c6

Browse files
author
CI
committed
Automated update of common script sources and hash
1 parent d7bb112 commit e6445c6

File tree

72 files changed

+491
-95
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+491
-95
lines changed

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

+3-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ set -e
1414
AZ_VERSION=${1:-"latest"}
1515
MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"
1616
AZCLI_ARCHIVE_ARCHITECTURES="amd64"
17-
AZCLI_ARCHIVE_VERSION_CODENAMES="stretch buster bullseye bionic focal"
17+
AZCLI_ARCHIVE_VERSION_CODENAMES="stretch buster bullseye bionic focal jammy"
1818

1919
if [ "$(id -u)" -ne 0 ]; then
2020
echo -e 'Script must be run as root. Use sudo, su, or add "USER root" to your Dockerfile before running this script.'
@@ -165,13 +165,15 @@ install_using_pip() {
165165
echo "(*) Installing Azure CLI..."
166166
. /etc/os-release
167167
architecture="$(dpkg --print-architecture)"
168+
CACHED_AZURE_VERSION="${AZ_VERSION}" # In case we need to fallback to pip and the apt path has modified the AZ_VERSION variable.
168169
if [[ "${AZCLI_ARCHIVE_ARCHITECTURES}" = *"${architecture}"* ]] && [[ "${AZCLI_ARCHIVE_VERSION_CODENAMES}" = *"${VERSION_CODENAME}"* ]]; then
169170
install_using_apt || use_pip="true"
170171
else
171172
use_pip="true"
172173
fi
173174

174175
if [ "${use_pip}" = "true" ]; then
176+
AZ_VERSION=${CACHED_AZURE_VERSION}
175177
install_using_pip
176178

177179
if [ "$?" != 0 ]; then

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ if [ "${PACKAGES_ALREADY_INSTALLED}" != "true" ]; then
102102
libkrb5-3 \
103103
libgssapi-krb5-2 \
104104
libicu[0-9][0-9] \
105-
liblttng-ust0 \
105+
liblttng-ust[0-9] \
106106
libstdc++6 \
107107
zlib1g \
108108
locales \

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

+23
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ USE_MOBY=${5:-"true"}
1717
DOCKER_VERSION=${6:-"latest"}
1818
DOCKER_DASH_COMPOSE_VERSION=${7:-"v1"} # v1 or v2
1919
MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"
20+
DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES="buster bullseye bionic focal jammy"
21+
DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES="buster bullseye bionic focal hirsute impish jammy"
2022

2123
set -e
2224

@@ -125,6 +127,26 @@ fi
125127
# Fetch host/container arch.
126128
architecture="$(dpkg --print-architecture)"
127129

130+
# Check if distro is suppported
131+
if [ "${USE_MOBY}" = "true" ]; then
132+
# 'get_common_setting' allows attribute to be updated remotely
133+
get_common_setting DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES
134+
if [[ "${DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES}" != *"${VERSION_CODENAME}"* ]]; then
135+
err "Unsupported distribution version '${VERSION_CODENAME}'. To resolve, either: (1) set feature option '\"moby\": false' , or (2) choose a compatible OS distribution"
136+
err "Support distributions include: ${DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES}"
137+
exit 1
138+
fi
139+
echo "Distro codename '${VERSION_CODENAME}' matched filter '${DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES}'"
140+
else
141+
get_common_setting DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES
142+
if [[ "${DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES}" != *"${VERSION_CODENAME}"* ]]; then
143+
err "Unsupported distribution version '${VERSION_CODENAME}'. To resolve, please choose a compatible OS distribution"
144+
err "Support distributions include: ${DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES}"
145+
exit 1
146+
fi
147+
echo "Distro codename '${VERSION_CODENAME}' matched filter '${DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES}'"
148+
fi
149+
128150
# Set up the necessary apt repos (either Microsoft's or Docker's)
129151
if [ "${USE_MOBY}" = "true" ]; then
130152

@@ -176,6 +198,7 @@ else
176198
apt-get -y install --no-install-recommends moby-compose || echo "(*) Package moby-compose (Docker Compose v2) not available for OS ${ID} ${VERSION_CODENAME} (${architecture}). Skipping."
177199
else
178200
apt-get -y install --no-install-recommends docker-ce-cli${cli_version_suffix}
201+
apt-get -y install --no-install-recommends docker-compose-plugin || echo "(*) Package docker-compose-plugin (Docker Compose v2) not available for OS ${ID} ${VERSION_CODENAME} (${architecture}). Skipping."
179202
fi
180203
fi
181204

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

+1
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ su ${USERNAME} -c "$(cat << EOF
126126
umask 0002
127127
# Do not update profile - we'll do this manually
128128
export PROFILE=/dev/null
129+
ls -lah /home/${USERNAME}/.nvs || :
129130
curl -so- https://raw.githubusercontent.com/nvm-sh/nvm/v${NVM_VERSION}/install.sh | bash
130131
source ${NVM_DIR}/nvm.sh
131132
if [ "${NODE_VERSION}" != "" ]; then

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

+3-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ set -e
1414
AZ_VERSION=${1:-"latest"}
1515
MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"
1616
AZCLI_ARCHIVE_ARCHITECTURES="amd64"
17-
AZCLI_ARCHIVE_VERSION_CODENAMES="stretch buster bullseye bionic focal"
17+
AZCLI_ARCHIVE_VERSION_CODENAMES="stretch buster bullseye bionic focal jammy"
1818

1919
if [ "$(id -u)" -ne 0 ]; then
2020
echo -e 'Script must be run as root. Use sudo, su, or add "USER root" to your Dockerfile before running this script.'
@@ -165,13 +165,15 @@ install_using_pip() {
165165
echo "(*) Installing Azure CLI..."
166166
. /etc/os-release
167167
architecture="$(dpkg --print-architecture)"
168+
CACHED_AZURE_VERSION="${AZ_VERSION}" # In case we need to fallback to pip and the apt path has modified the AZ_VERSION variable.
168169
if [[ "${AZCLI_ARCHIVE_ARCHITECTURES}" = *"${architecture}"* ]] && [[ "${AZCLI_ARCHIVE_VERSION_CODENAMES}" = *"${VERSION_CODENAME}"* ]]; then
169170
install_using_apt || use_pip="true"
170171
else
171172
use_pip="true"
172173
fi
173174

174175
if [ "${use_pip}" = "true" ]; then
176+
AZ_VERSION=${CACHED_AZURE_VERSION}
175177
install_using_pip
176178

177179
if [ "$?" != 0 ]; then

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ if [ "${PACKAGES_ALREADY_INSTALLED}" != "true" ]; then
102102
libkrb5-3 \
103103
libgssapi-krb5-2 \
104104
libicu[0-9][0-9] \
105-
liblttng-ust0 \
105+
liblttng-ust[0-9] \
106106
libstdc++6 \
107107
zlib1g \
108108
locales \

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

+1
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ su ${USERNAME} -c "$(cat << EOF
126126
umask 0002
127127
# Do not update profile - we'll do this manually
128128
export PROFILE=/dev/null
129+
ls -lah /home/${USERNAME}/.nvs || :
129130
curl -so- https://raw.githubusercontent.com/nvm-sh/nvm/v${NVM_VERSION}/install.sh | bash
130131
source ${NVM_DIR}/nvm.sh
131132
if [ "${NODE_VERSION}" != "" ]; then

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

+3-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ set -e
1414
AZ_VERSION=${1:-"latest"}
1515
MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"
1616
AZCLI_ARCHIVE_ARCHITECTURES="amd64"
17-
AZCLI_ARCHIVE_VERSION_CODENAMES="stretch buster bullseye bionic focal"
17+
AZCLI_ARCHIVE_VERSION_CODENAMES="stretch buster bullseye bionic focal jammy"
1818

1919
if [ "$(id -u)" -ne 0 ]; then
2020
echo -e 'Script must be run as root. Use sudo, su, or add "USER root" to your Dockerfile before running this script.'
@@ -165,13 +165,15 @@ install_using_pip() {
165165
echo "(*) Installing Azure CLI..."
166166
. /etc/os-release
167167
architecture="$(dpkg --print-architecture)"
168+
CACHED_AZURE_VERSION="${AZ_VERSION}" # In case we need to fallback to pip and the apt path has modified the AZ_VERSION variable.
168169
if [[ "${AZCLI_ARCHIVE_ARCHITECTURES}" = *"${architecture}"* ]] && [[ "${AZCLI_ARCHIVE_VERSION_CODENAMES}" = *"${VERSION_CODENAME}"* ]]; then
169170
install_using_apt || use_pip="true"
170171
else
171172
use_pip="true"
172173
fi
173174

174175
if [ "${use_pip}" = "true" ]; then
176+
AZ_VERSION=${CACHED_AZURE_VERSION}
175177
install_using_pip
176178

177179
if [ "$?" != 0 ]; then

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ if [ "${PACKAGES_ALREADY_INSTALLED}" != "true" ]; then
102102
libkrb5-3 \
103103
libgssapi-krb5-2 \
104104
libicu[0-9][0-9] \
105-
liblttng-ust0 \
105+
liblttng-ust[0-9] \
106106
libstdc++6 \
107107
zlib1g \
108108
locales \

containers/azure-static-web-apps/.devcontainer/library-scripts/node-debian.sh

+1
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ su ${USERNAME} -c "$(cat << EOF
126126
umask 0002
127127
# Do not update profile - we'll do this manually
128128
export PROFILE=/dev/null
129+
ls -lah /home/${USERNAME}/.nvs || :
129130
curl -so- https://raw.githubusercontent.com/nvm-sh/nvm/v${NVM_VERSION}/install.sh | bash
130131
source ${NVM_DIR}/nvm.sh
131132
if [ "${NODE_VERSION}" != "" ]; then

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

+3-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ set -e
1414
AZ_VERSION=${1:-"latest"}
1515
MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"
1616
AZCLI_ARCHIVE_ARCHITECTURES="amd64"
17-
AZCLI_ARCHIVE_VERSION_CODENAMES="stretch buster bullseye bionic focal"
17+
AZCLI_ARCHIVE_VERSION_CODENAMES="stretch buster bullseye bionic focal jammy"
1818

1919
if [ "$(id -u)" -ne 0 ]; then
2020
echo -e 'Script must be run as root. Use sudo, su, or add "USER root" to your Dockerfile before running this script.'
@@ -165,13 +165,15 @@ install_using_pip() {
165165
echo "(*) Installing Azure CLI..."
166166
. /etc/os-release
167167
architecture="$(dpkg --print-architecture)"
168+
CACHED_AZURE_VERSION="${AZ_VERSION}" # In case we need to fallback to pip and the apt path has modified the AZ_VERSION variable.
168169
if [[ "${AZCLI_ARCHIVE_ARCHITECTURES}" = *"${architecture}"* ]] && [[ "${AZCLI_ARCHIVE_VERSION_CODENAMES}" = *"${VERSION_CODENAME}"* ]]; then
169170
install_using_apt || use_pip="true"
170171
else
171172
use_pip="true"
172173
fi
173174

174175
if [ "${use_pip}" = "true" ]; then
176+
AZ_VERSION=${CACHED_AZURE_VERSION}
175177
install_using_pip
176178

177179
if [ "$?" != 0 ]; then

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ if [ "${PACKAGES_ALREADY_INSTALLED}" != "true" ]; then
102102
libkrb5-3 \
103103
libgssapi-krb5-2 \
104104
libicu[0-9][0-9] \
105-
liblttng-ust0 \
105+
liblttng-ust[0-9] \
106106
libstdc++6 \
107107
zlib1g \
108108
locales \

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

+23
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ USE_MOBY=${5:-"true"}
1717
DOCKER_VERSION=${6:-"latest"}
1818
DOCKER_DASH_COMPOSE_VERSION=${7:-"v1"} # v1 or v2
1919
MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"
20+
DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES="buster bullseye bionic focal jammy"
21+
DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES="buster bullseye bionic focal hirsute impish jammy"
2022

2123
set -e
2224

@@ -125,6 +127,26 @@ fi
125127
# Fetch host/container arch.
126128
architecture="$(dpkg --print-architecture)"
127129

130+
# Check if distro is suppported
131+
if [ "${USE_MOBY}" = "true" ]; then
132+
# 'get_common_setting' allows attribute to be updated remotely
133+
get_common_setting DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES
134+
if [[ "${DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES}" != *"${VERSION_CODENAME}"* ]]; then
135+
err "Unsupported distribution version '${VERSION_CODENAME}'. To resolve, either: (1) set feature option '\"moby\": false' , or (2) choose a compatible OS distribution"
136+
err "Support distributions include: ${DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES}"
137+
exit 1
138+
fi
139+
echo "Distro codename '${VERSION_CODENAME}' matched filter '${DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES}'"
140+
else
141+
get_common_setting DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES
142+
if [[ "${DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES}" != *"${VERSION_CODENAME}"* ]]; then
143+
err "Unsupported distribution version '${VERSION_CODENAME}'. To resolve, please choose a compatible OS distribution"
144+
err "Support distributions include: ${DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES}"
145+
exit 1
146+
fi
147+
echo "Distro codename '${VERSION_CODENAME}' matched filter '${DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES}'"
148+
fi
149+
128150
# Set up the necessary apt repos (either Microsoft's or Docker's)
129151
if [ "${USE_MOBY}" = "true" ]; then
130152

@@ -176,6 +198,7 @@ else
176198
apt-get -y install --no-install-recommends moby-compose || echo "(*) Package moby-compose (Docker Compose v2) not available for OS ${ID} ${VERSION_CODENAME} (${architecture}). Skipping."
177199
else
178200
apt-get -y install --no-install-recommends docker-ce-cli${cli_version_suffix}
201+
apt-get -y install --no-install-recommends docker-compose-plugin || echo "(*) Package docker-compose-plugin (Docker Compose v2) not available for OS ${ID} ${VERSION_CODENAME} (${architecture}). Skipping."
179202
fi
180203
fi
181204

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

+1
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ su ${USERNAME} -c "$(cat << EOF
126126
umask 0002
127127
# Do not update profile - we'll do this manually
128128
export PROFILE=/dev/null
129+
ls -lah /home/${USERNAME}/.nvs || :
129130
curl -so- https://raw.githubusercontent.com/nvm-sh/nvm/v${NVM_VERSION}/install.sh | bash
130131
source ${NVM_DIR}/nvm.sh
131132
if [ "${NODE_VERSION}" != "" ]; then

containers/bazel/.devcontainer/library-scripts/common-debian.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ if [ "${PACKAGES_ALREADY_INSTALLED}" != "true" ]; then
102102
libkrb5-3 \
103103
libgssapi-krb5-2 \
104104
libicu[0-9][0-9] \
105-
liblttng-ust0 \
105+
liblttng-ust[0-9] \
106106
libstdc++6 \
107107
zlib1g \
108108
locales \

containers/codespaces-linux/.devcontainer/library-scripts/common-debian.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ if [ "${PACKAGES_ALREADY_INSTALLED}" != "true" ]; then
102102
libkrb5-3 \
103103
libgssapi-krb5-2 \
104104
libicu[0-9][0-9] \
105-
liblttng-ust0 \
105+
liblttng-ust[0-9] \
106106
libstdc++6 \
107107
zlib1g \
108108
locales \

containers/codespaces-linux/.devcontainer/library-scripts/docker-debian.sh

+23
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ USE_MOBY=${5:-"true"}
1717
DOCKER_VERSION=${6:-"latest"}
1818
DOCKER_DASH_COMPOSE_VERSION=${7:-"v1"} # v1 or v2
1919
MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"
20+
DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES="buster bullseye bionic focal jammy"
21+
DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES="buster bullseye bionic focal hirsute impish jammy"
2022

2123
set -e
2224

@@ -125,6 +127,26 @@ fi
125127
# Fetch host/container arch.
126128
architecture="$(dpkg --print-architecture)"
127129

130+
# Check if distro is suppported
131+
if [ "${USE_MOBY}" = "true" ]; then
132+
# 'get_common_setting' allows attribute to be updated remotely
133+
get_common_setting DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES
134+
if [[ "${DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES}" != *"${VERSION_CODENAME}"* ]]; then
135+
err "Unsupported distribution version '${VERSION_CODENAME}'. To resolve, either: (1) set feature option '\"moby\": false' , or (2) choose a compatible OS distribution"
136+
err "Support distributions include: ${DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES}"
137+
exit 1
138+
fi
139+
echo "Distro codename '${VERSION_CODENAME}' matched filter '${DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES}'"
140+
else
141+
get_common_setting DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES
142+
if [[ "${DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES}" != *"${VERSION_CODENAME}"* ]]; then
143+
err "Unsupported distribution version '${VERSION_CODENAME}'. To resolve, please choose a compatible OS distribution"
144+
err "Support distributions include: ${DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES}"
145+
exit 1
146+
fi
147+
echo "Distro codename '${VERSION_CODENAME}' matched filter '${DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES}'"
148+
fi
149+
128150
# Set up the necessary apt repos (either Microsoft's or Docker's)
129151
if [ "${USE_MOBY}" = "true" ]; then
130152

@@ -176,6 +198,7 @@ else
176198
apt-get -y install --no-install-recommends moby-compose || echo "(*) Package moby-compose (Docker Compose v2) not available for OS ${ID} ${VERSION_CODENAME} (${architecture}). Skipping."
177199
else
178200
apt-get -y install --no-install-recommends docker-ce-cli${cli_version_suffix}
201+
apt-get -y install --no-install-recommends docker-compose-plugin || echo "(*) Package docker-compose-plugin (Docker Compose v2) not available for OS ${ID} ${VERSION_CODENAME} (${architecture}). Skipping."
179202
fi
180203
fi
181204

0 commit comments

Comments
 (0)