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

Commit 19ce733

Browse files
author
CI
committed
Automated update of common script sources and hash
1 parent c5a4cfe commit 19ce733

File tree

64 files changed

+437
-71
lines changed

Some content is hidden

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

64 files changed

+437
-71
lines changed

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

+22
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

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/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/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/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

+22
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

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

+22
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

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

+63-12
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,27 @@ USE_MOBY=${3:-"true"}
1515
DOCKER_VERSION=${4:-"latest"} # The Docker/Moby Engine + CLI should match in version
1616
DOCKER_DASH_COMPOSE_VERSION=${5:-"v1"} # v1 or v2
1717
MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"
18+
DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES="buster bullseye bionic focal jammy"
19+
DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES="buster bullseye bionic focal hirsute impish jammy"
1820

21+
# Default: Exit on any failure.
1922
set -e
2023

24+
# Setup STDERR.
25+
err() {
26+
echo "(!) $*" >&2
27+
}
28+
2129
if [ "$(id -u)" -ne 0 ]; then
22-
echo -e 'Script must be run as root. Use sudo, su, or add "USER root" to your Dockerfile before running this script.'
30+
err 'Script must be run as root. Use sudo, su, or add "USER root" to your Dockerfile before running this script.'
2331
exit 1
2432
fi
2533

34+
###################
35+
# Helper Functions
36+
# See: https://github.com/microsoft/vscode-dev-containers/blob/main/script-library/shared/utils.sh
37+
###################
38+
2639
# Determine the appropriate non-root user
2740
if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then
2841
USERNAME=""
@@ -97,20 +110,50 @@ find_version_from_git_tags() {
97110
declare -g ${variable_name}="$(echo "${version_list}" | head -n 1)"
98111
else
99112
set +e
100-
declare -g ${variable_name}="$(echo "${version_list}" | grep -E -m 1 "^${requested_version//./\\.}([\\.\\s]|$)")"
113+
declare -g ${variable_name}="$(echo "${version_list}" | grep -E -m 1 "^${requested_version//./\\.}([\\.\\s]|$)")"
101114
set -e
102115
fi
103116
fi
104117
if [ -z "${!variable_name}" ] || ! echo "${version_list}" | grep "^${!variable_name//./\\.}$" > /dev/null 2>&1; then
105-
echo -e "Invalid ${variable_name} value: ${requested_version}\nValid values:\n${version_list}" >&2
118+
err "Invalid ${variable_name} value: ${requested_version}\nValid values:\n${version_list}" >&2
106119
exit 1
107120
fi
108121
echo "${variable_name}=${!variable_name}"
109122
}
110123

124+
###########################################
125+
# Start docker-in-docker installation
126+
###########################################
127+
111128
# Ensure apt is in non-interactive to avoid prompts
112129
export DEBIAN_FRONTEND=noninteractive
113130

131+
132+
# Source /etc/os-release to get OS info
133+
. /etc/os-release
134+
# Fetch host/container arch.
135+
architecture="$(dpkg --print-architecture)"
136+
137+
# Check if distro is suppported
138+
if [ "${USE_MOBY}" = "true" ]; then
139+
# 'get_common_setting' allows attribute to be updated remotely
140+
get_common_setting DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES
141+
if [[ "${DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES}" != *"${VERSION_CODENAME}"* ]]; then
142+
err "Unsupported distribution version '${VERSION_CODENAME}'. To resolve, either: (1) set feature option '\"moby\": false' , or (2) choose a compatible OS distribution"
143+
err "Support distributions include: ${DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES}"
144+
exit 1
145+
fi
146+
echo "Distro codename '${VERSION_CODENAME}' matched filter '${DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES}'"
147+
else
148+
get_common_setting DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES
149+
if [[ "${DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES}" != *"${VERSION_CODENAME}"* ]]; then
150+
err "Unsupported distribution version '${VERSION_CODENAME}'. To resolve, please choose a compatible OS distribution"
151+
err "Support distributions include: ${DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES}"
152+
exit 1
153+
fi
154+
echo "Distro codename '${VERSION_CODENAME}' matched filter '${DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES}'"
155+
fi
156+
114157
# Install dependencies
115158
check_packages apt-transport-https curl ca-certificates pigz iptables gnupg2 dirmngr
116159
if ! type git > /dev/null 2>&1; then
@@ -124,10 +167,7 @@ if type iptables-legacy > /dev/null 2>&1; then
124167
update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy
125168
fi
126169

127-
# Source /etc/os-release to get OS info
128-
. /etc/os-release
129-
# Fetch host/container arch.
130-
architecture="$(dpkg --print-architecture)"
170+
131171

132172
# Set up the necessary apt repos (either Microsoft's or Docker's)
133173
if [ "${USE_MOBY}" = "true" ]; then
@@ -165,11 +205,11 @@ else
165205
# Regex needs to handle debian package version number format: https://www.systutorials.com/docs/linux/man/5-deb-version/
166206
docker_version_regex="^(.+:)?${docker_version_dot_plus_escaped}([\\.\\+ ~:-]|$)"
167207
set +e # Don't exit if finding version fails - will handle gracefully
168-
cli_version_suffix="=$(apt-cache madison ${cli_package_name} | awk -F"|" '{print $2}' | sed -e 's/^[ \t]*//' | grep -E -m 1 "${docker_version_regex}")"
169-
engine_version_suffix="=$(apt-cache madison ${engine_package_name} | awk -F"|" '{print $2}' | sed -e 's/^[ \t]*//' | grep -E -m 1 "${docker_version_regex}")"
208+
cli_version_suffix="=$(apt-cache madison ${cli_package_name} | awk -F"|" '{print $2}' | sed -e 's/^[ \t]*//' | grep -E -m 1 "${docker_version_regex}")"
209+
engine_version_suffix="=$(apt-cache madison ${engine_package_name} | awk -F"|" '{print $2}' | sed -e 's/^[ \t]*//' | grep -E -m 1 "${docker_version_regex}")"
170210
set -e
171211
if [ -z "${engine_version_suffix}" ] || [ "${engine_version_suffix}" = "=" ] || [ -z "${cli_version_suffix}" ] || [ "${cli_version_suffix}" = "=" ] ; then
172-
echo "(!) No full or partial Docker / Moby version match found for \"${DOCKER_VERSION}\" on OS ${ID} ${VERSION_CODENAME} (${architecture}). Available versions:"
212+
err "No full or partial Docker / Moby version match found for \"${DOCKER_VERSION}\" on OS ${ID} ${VERSION_CODENAME} (${architecture}). Available versions:"
173213
apt-cache madison ${cli_package_name} | awk -F"|" '{print $2}' | grep -oP '^(.+:)?\K.+'
174214
exit 1
175215
fi
@@ -182,8 +222,17 @@ if type docker > /dev/null 2>&1 && type dockerd > /dev/null 2>&1; then
182222
echo "Docker / Moby CLI and Engine already installed."
183223
else
184224
if [ "${USE_MOBY}" = "true" ]; then
185-
apt-get -y install --no-install-recommends moby-cli${cli_version_suffix} moby-buildx moby-engine${engine_version_suffix}
186-
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."
225+
# Install engine
226+
set +e # Handle error gracefully
227+
apt-get -y install --no-install-recommends moby-cli${cli_version_suffix} moby-buildx moby-engine${engine_version_suffix}
228+
if [ $? -ne 0 ]; then
229+
err "Packages for moby not available in OS ${ID} ${VERSION_CODENAME} (${architecture}). To resolve, either: (1) set feature option '\"moby\": false' , or (2) choose a compatible OS version (eg: 'ubuntu-20.04')."
230+
exit 1
231+
fi
232+
set -e
233+
234+
# Install compose
235+
apt-get -y install --no-install-recommends moby-compose || err "Package moby-compose (Docker Compose v2) not available for OS ${ID} ${VERSION_CODENAME} (${architecture}). Skipping."
187236
else
188237
apt-get -y install --no-install-recommends docker-ce-cli${cli_version_suffix} docker-ce${engine_version_suffix}
189238
fi
@@ -344,3 +393,5 @@ EOF
344393

345394
chmod +x /usr/local/share/docker-init.sh
346395
chown ${USERNAME}:root /usr/local/share/docker-init.sh
396+
397+
echo 'docker-in-docker-debian script has completed!'

containers/codespaces-linux/.devcontainer/library-scripts/git-lfs-debian.sh

+15-1
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ install_using_apt() {
140140

141141
if ! (apt-get update && apt-get install -yq git-lfs${version_suffix}); then
142142
rm -f /etc/apt/sources.list.d/git-lfs.list
143+
echo "Could not fetch git-lfs from apt"
143144
return 1
144145
fi
145146

@@ -152,15 +153,28 @@ install_using_github() {
152153
cd /tmp/git-lfs
153154
find_version_from_git_tags GIT_LFS_VERSION "https://github.com/git-lfs/git-lfs"
154155
git_lfs_filename="git-lfs-linux-${architecture}-v${GIT_LFS_VERSION}.tar.gz"
156+
echo "Looking for release artfact: ${git_lfs_filename}"
155157
curl -sSL -o "${git_lfs_filename}" "https://github.com/git-lfs/git-lfs/releases/download/v${GIT_LFS_VERSION}/${git_lfs_filename}"
156158
# Verify file
157159
curl -sSL -o "sha256sums.asc" "https://github.com/git-lfs/git-lfs/releases/download/v${GIT_LFS_VERSION}/sha256sums.asc"
158160
receive_gpg_keys GIT_LFS_CHECKSUM_GPG_KEYS
159161
gpg -q --decrypt "sha256sums.asc" > sha256sums
160162
sha256sum --ignore-missing -c "sha256sums"
161163
# Extract and install
164+
echo "Validated release artifact integrity."
165+
echo "Starting to extract..."
162166
tar xf "${git_lfs_filename}" -C .
163-
./install.sh
167+
echo "Installing..."
168+
if [ -f "./install.sh" ]; then
169+
./install.sh
170+
else
171+
# Starting around v3.2.0, the release
172+
# artifact file structure changed slightly
173+
enclosed_folder="git-lfs-${GIT_LFS_VERSION}"
174+
cd ${enclosed_folder}
175+
./install.sh
176+
cd ../
177+
fi
164178
rm -rf /tmp/git-lfs /tmp/tmp-gnupg
165179
}
166180

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ echo "Downloading github CLI..."
181181
# Import key safely (new method rather than deprecated apt-key approach) and install
182182
. /etc/os-release
183183
receive_gpg_keys GITHUB_CLI_ARCHIVE_GPG_KEY /usr/share/keyrings/githubcli-archive-keyring.gpg
184-
echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages ${VERSION_CODENAME} main" > /etc/apt/sources.list.d/github-cli.list
184+
echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" > /etc/apt/sources.list.d/github-cli.list
185185
apt-get update
186186
apt-get -y install "gh${version_suffix}"
187187
rm -rf "/tmp/gh/gnupg"

containers/codespaces-linux/.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/codespaces-linux/.devcontainer/library-scripts/sshd-debian.sh

+7
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,13 @@ elif [ "${NEW_PASSWORD}" != "skip" ]; then
7575
echo "${USERNAME}:${NEW_PASSWORD}" | chpasswd
7676
fi
7777

78+
if [ $(getent group ssh) ]; then
79+
echo "'ssh' group already exists."
80+
else
81+
echo "adding 'ssh' group, as it does not already exist."
82+
groupadd ssh
83+
fi
84+
7885
# Add user to ssh group
7986
if [ "${USERNAME}" != "root" ]; then
8087
usermod -aG ssh ${USERNAME}

0 commit comments

Comments
 (0)