Skip to content

Commit 3541013

Browse files
committed
Updated Feature Versions
1 parent fd8de96 commit 3541013

File tree

8 files changed

+48
-48
lines changed

8 files changed

+48
-48
lines changed

src/docker-outside-of-docker/devcontainer-feature.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"id": "docker-outside-of-docker",
3-
"version": "1.6.0",
3+
"version": "1.6.1",
44
"name": "Docker (docker-outside-of-docker)",
55
"documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-outside-of-docker",
66
"description": "Reuse the host docker socket, adding the Docker CLI to a container. Feature invokes a script to enable using a forwarded Docker socket within a container to run Docker commands.",

src/dotnet/install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ for aspNetCoreRuntimeVersion in $(split_csv "$ASPNETCORE_RUNTIME_VERSIONS"); do
7777
aspNetCoreRuntimeVersions+=("$aspNetCoreRuntimeVersion")
7878
done
7979

80-
# Fail fast in case of bad input to avoid unnecessary work
80+
# Fail fast in case of bad input to avoid unneccesary work
8181
# v1 of the .NET feature allowed specifying only a major version 'X' like '3'
8282
# v2 removed this ability
8383
# - because install-dotnet.sh does not support it directly

src/dotnet/scripts/vendor/dotnet-install.sh

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -406,8 +406,8 @@ get_normalized_architecture_for_specific_sdk_version() {
406406

407407
if [ "$osname" == "osx" ] && [ "$architecture" == "arm64" ] && { [ "$is_version_support_arm64" = false ] || [ "$is_channel_support_arm64" = false ]; }; then
408408
#check if rosetta is installed
409-
if [ "$(/usr/bin/pgrep oahd >/dev/null 2>&1;echo $?)" -eq 0 ]; then
410-
say_verbose "Changing user architecture from '$architecture' to 'x64' because .NET SDKs prior to version 6.0 do not support arm64."
409+
if [ "$(/usr/bin/pgrep oahd >/dev/null 2>&1;echo $?)" -eq 0 ]; then
410+
say_verbose "Changing user architecture from '$architecture' to 'x64' because .NET SDKs prior to version 6.0 do not support arm64."
411411
echo "x64"
412412
return 0;
413413
else
@@ -425,7 +425,7 @@ get_normalized_architecture_for_specific_sdk_version() {
425425
is_arm64_supported() {
426426
#any channel or version that starts with the specified versions
427427
case "$1" in
428-
( "1"* | "2"* | "3"* | "4"* | "5"*)
428+
( "1"* | "2"* | "3"* | "4"* | "5"*)
429429
echo false
430430
return 0
431431
esac
@@ -585,7 +585,7 @@ is_dotnet_package_installed() {
585585
# args:
586586
# downloaded file - $1
587587
# remote_file_size - $2
588-
validate_remote_local_file_sizes()
588+
validate_remote_local_file_sizes()
589589
{
590590
eval $invocation
591591

@@ -598,8 +598,8 @@ validate_remote_local_file_sizes()
598598
elif [[ "$OSTYPE" == "darwin"* ]]; then
599599
# hardcode in order to avoid conflicts with GNU stat
600600
file_size="$(/usr/bin/stat -f '%z' "$downloaded_file")"
601-
fi
602-
601+
fi
602+
603603
if [ -n "$file_size" ]; then
604604
say "Downloaded file size is $file_size bytes."
605605

@@ -610,10 +610,10 @@ validate_remote_local_file_sizes()
610610
say "The remote and local file sizes are equal."
611611
fi
612612
fi
613-
613+
614614
else
615-
say "Either downloaded or local package size can not be measured. One of them may be corrupted."
616-
fi
615+
say "Either downloaded or local package size can not be measured. One of them may be corrupted."
616+
fi
617617
}
618618

619619
# args:
@@ -793,7 +793,7 @@ get_specific_product_version() {
793793
fi
794794
fi
795795
done
796-
796+
797797
# Getting the version number with productVersion.txt has failed. Try parsing the download link for a version number.
798798
say_verbose "Failed to get the version using productVersion.txt file. Download link will be parsed instead."
799799
specific_product_version="$(get_product_specific_version_from_download_link "$package_download_link" "$specific_version")"
@@ -858,7 +858,7 @@ get_product_specific_version_from_download_link()
858858

859859
local download_link="$1"
860860
local specific_version="$2"
861-
local specific_product_version=""
861+
local specific_product_version=""
862862

863863
if [ -z "$download_link" ]; then
864864
echo "$specific_version"
@@ -1026,9 +1026,9 @@ extract_dotnet_package() {
10261026
local folders_with_version_regex='^.*/[0-9]+\.[0-9]+[^/]+/'
10271027
find "$temp_out_path" -type f | grep -Eo "$folders_with_version_regex" | sort | copy_files_or_dirs_from_list "$temp_out_path" "$out_path" false
10281028
find "$temp_out_path" -type f | grep -Ev "$folders_with_version_regex" | copy_files_or_dirs_from_list "$temp_out_path" "$out_path" "$override_non_versioned_files"
1029-
1029+
10301030
validate_remote_local_file_sizes "$zip_path" "$remote_file_size"
1031-
1031+
10321032
rm -rf "$temp_out_path"
10331033
if [ -z ${keep_zip+x} ]; then
10341034
rm -f "$zip_path" && say_verbose "Temporary archive file $zip_path was removed"
@@ -1175,7 +1175,7 @@ downloadcurl() {
11751175
curl $curl_options -o "$out_path" "$remote_path_with_credential" 2>&1
11761176
curl_exit_code=$?
11771177
fi
1178-
1178+
11791179
if [ $curl_exit_code -gt 0 ]; then
11801180
download_error_msg="Unable to download $remote_path."
11811181
# Check for curl timeout codes
@@ -1253,7 +1253,7 @@ get_download_link_from_aka_ms() {
12531253
say_warning "Specifying quality for STS or LTS channel is not supported, the quality will be ignored."
12541254
fi
12551255
1256-
say_verbose "Retrieving primary payload URL from aka.ms for channel: '$normalized_channel', quality: '$normalized_quality', product: '$normalized_product', os: '$normalized_os', architecture: '$normalized_architecture'."
1256+
say_verbose "Retrieving primary payload URL from aka.ms for channel: '$normalized_channel', quality: '$normalized_quality', product: '$normalized_product', os: '$normalized_os', architecture: '$normalized_architecture'."
12571257
12581258
#construct aka.ms link
12591259
aka_ms_link="https://aka.ms/dotnet"
@@ -1447,14 +1447,14 @@ generate_regular_links() {
14471447
14481448
if [ "$valid_legacy_download_link" = true ]; then
14491449
say_verbose "Constructed legacy named payload URL: $legacy_download_link"
1450-
1450+
14511451
download_links+=($legacy_download_link)
14521452
specific_versions+=($specific_version)
14531453
effective_versions+=($effective_version)
14541454
link_types+=("legacy")
14551455
else
14561456
legacy_download_link=""
1457-
say_verbose "Could not construct a legacy_download_link; omitting..."
1457+
say_verbose "Cound not construct a legacy_download_link; omitting..."
14581458
fi
14591459
14601460
# Check if the SDK version is already installed.
@@ -1475,7 +1475,7 @@ print_dry_run() {
14751475
14761476
resolved_version=${specific_versions[0]}
14771477
repeatable_command="./$script_name --version "\""$resolved_version"\"" --install-dir "\""$install_root"\"" --architecture "\""$normalized_architecture"\"" --os "\""$normalized_os"\"""
1478-
1478+
14791479
if [ ! -z "$normalized_quality" ]; then
14801480
repeatable_command+=" --quality "\""$normalized_quality"\"""
14811481
fi
@@ -1772,9 +1772,9 @@ do
17721772
echo " -q,--quality <quality> Download the latest build of specified quality in the channel."
17731773
echo " -Quality"
17741774
echo " The possible values are: daily, signed, validated, preview, GA."
1775-
echo " Works only in combination with channel. Not applicable for STS and LTS channels and will be ignored if those channels are used."
1776-
echo " For SDK use channel in A.B.Cxx format. Using quality for SDK together with channel in A.B format is not supported."
1777-
echo " Supported since 5.0 release."
1775+
echo " Works only in combination with channel. Not applicable for STS and LTS channels and will be ignored if those channels are used."
1776+
echo " For SDK use channel in A.B.Cxx format. Using quality for SDK together with channel in A.B format is not supported."
1777+
echo " Supported since 5.0 release."
17781778
echo " Note: The version parameter overrides the channel parameter when any version other than 'latest' is used, and therefore overrides the quality."
17791779
echo " --internal,-Internal Download internal builds. Requires providing credentials via --feed-credential parameter."
17801780
echo " --feed-credential <FEEDCREDENTIAL> Token to access Azure feed. Used as a query string to append to the Azure feed."

src/java/devcontainer-feature.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"id": "java",
3-
"version": "1.6.1",
3+
"version": "1.6.2",
44
"name": "Java (via SDKMAN!)",
55
"documentationURL": "https://github.com/devcontainers/features/tree/main/src/java",
66
"description": "Installs Java, SDKMAN! (if not installed), and needed dependencies.",

src/node/devcontainer-feature.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"id": "node",
3-
"version": "1.6.0",
3+
"version": "1.6.1",
44
"name": "Node.js (via nvm), yarn and pnpm",
55
"documentationURL": "https://github.com/devcontainers/features/tree/main/src/node",
66
"description": "Installs Node.js, nvm, yarn, pnpm, and needed dependencies.",

src/oryx/scripts/vendor/dotnet-install.sh

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -406,8 +406,8 @@ get_normalized_architecture_for_specific_sdk_version() {
406406

407407
if [ "$osname" == "osx" ] && [ "$architecture" == "arm64" ] && { [ "$is_version_support_arm64" = false ] || [ "$is_channel_support_arm64" = false ]; }; then
408408
#check if rosetta is installed
409-
if [ "$(/usr/bin/pgrep oahd >/dev/null 2>&1;echo $?)" -eq 0 ]; then
410-
say_verbose "Changing user architecture from '$architecture' to 'x64' because .NET SDKs prior to version 6.0 do not support arm64."
409+
if [ "$(/usr/bin/pgrep oahd >/dev/null 2>&1;echo $?)" -eq 0 ]; then
410+
say_verbose "Changing user architecture from '$architecture' to 'x64' because .NET SDKs prior to version 6.0 do not support arm64."
411411
echo "x64"
412412
return 0;
413413
else
@@ -425,7 +425,7 @@ get_normalized_architecture_for_specific_sdk_version() {
425425
is_arm64_supported() {
426426
#any channel or version that starts with the specified versions
427427
case "$1" in
428-
( "1"* | "2"* | "3"* | "4"* | "5"*)
428+
( "1"* | "2"* | "3"* | "4"* | "5"*)
429429
echo false
430430
return 0
431431
esac
@@ -585,7 +585,7 @@ is_dotnet_package_installed() {
585585
# args:
586586
# downloaded file - $1
587587
# remote_file_size - $2
588-
validate_remote_local_file_sizes()
588+
validate_remote_local_file_sizes()
589589
{
590590
eval $invocation
591591

@@ -598,8 +598,8 @@ validate_remote_local_file_sizes()
598598
elif [[ "$OSTYPE" == "darwin"* ]]; then
599599
# hardcode in order to avoid conflicts with GNU stat
600600
file_size="$(/usr/bin/stat -f '%z' "$downloaded_file")"
601-
fi
602-
601+
fi
602+
603603
if [ -n "$file_size" ]; then
604604
say "Downloaded file size is $file_size bytes."
605605

@@ -610,10 +610,10 @@ validate_remote_local_file_sizes()
610610
say "The remote and local file sizes are equal."
611611
fi
612612
fi
613-
613+
614614
else
615-
say "Either downloaded or local package size can not be measured. One of them may be corrupted."
616-
fi
615+
say "Either downloaded or local package size can not be measured. One of them may be corrupted."
616+
fi
617617
}
618618

619619
# args:
@@ -793,7 +793,7 @@ get_specific_product_version() {
793793
fi
794794
fi
795795
done
796-
796+
797797
# Getting the version number with productVersion.txt has failed. Try parsing the download link for a version number.
798798
say_verbose "Failed to get the version using productVersion.txt file. Download link will be parsed instead."
799799
specific_product_version="$(get_product_specific_version_from_download_link "$package_download_link" "$specific_version")"
@@ -858,7 +858,7 @@ get_product_specific_version_from_download_link()
858858

859859
local download_link="$1"
860860
local specific_version="$2"
861-
local specific_product_version=""
861+
local specific_product_version=""
862862

863863
if [ -z "$download_link" ]; then
864864
echo "$specific_version"
@@ -1026,9 +1026,9 @@ extract_dotnet_package() {
10261026
local folders_with_version_regex='^.*/[0-9]+\.[0-9]+[^/]+/'
10271027
find "$temp_out_path" -type f | grep -Eo "$folders_with_version_regex" | sort | copy_files_or_dirs_from_list "$temp_out_path" "$out_path" false
10281028
find "$temp_out_path" -type f | grep -Ev "$folders_with_version_regex" | copy_files_or_dirs_from_list "$temp_out_path" "$out_path" "$override_non_versioned_files"
1029-
1029+
10301030
validate_remote_local_file_sizes "$zip_path" "$remote_file_size"
1031-
1031+
10321032
rm -rf "$temp_out_path"
10331033
if [ -z ${keep_zip+x} ]; then
10341034
rm -f "$zip_path" && say_verbose "Temporary archive file $zip_path was removed"
@@ -1175,7 +1175,7 @@ downloadcurl() {
11751175
curl $curl_options -o "$out_path" "$remote_path_with_credential" 2>&1
11761176
curl_exit_code=$?
11771177
fi
1178-
1178+
11791179
if [ $curl_exit_code -gt 0 ]; then
11801180
download_error_msg="Unable to download $remote_path."
11811181
# Check for curl timeout codes
@@ -1253,7 +1253,7 @@ get_download_link_from_aka_ms() {
12531253
say_warning "Specifying quality for STS or LTS channel is not supported, the quality will be ignored."
12541254
fi
12551255
1256-
say_verbose "Retrieving primary payload URL from aka.ms for channel: '$normalized_channel', quality: '$normalized_quality', product: '$normalized_product', os: '$normalized_os', architecture: '$normalized_architecture'."
1256+
say_verbose "Retrieving primary payload URL from aka.ms for channel: '$normalized_channel', quality: '$normalized_quality', product: '$normalized_product', os: '$normalized_os', architecture: '$normalized_architecture'."
12571257
12581258
#construct aka.ms link
12591259
aka_ms_link="https://aka.ms/dotnet"
@@ -1447,14 +1447,14 @@ generate_regular_links() {
14471447
14481448
if [ "$valid_legacy_download_link" = true ]; then
14491449
say_verbose "Constructed legacy named payload URL: $legacy_download_link"
1450-
1450+
14511451
download_links+=($legacy_download_link)
14521452
specific_versions+=($specific_version)
14531453
effective_versions+=($effective_version)
14541454
link_types+=("legacy")
14551455
else
14561456
legacy_download_link=""
1457-
say_verbose "Could not construct a legacy_download_link; omitting..."
1457+
say_verbose "Cound not construct a legacy_download_link; omitting..."
14581458
fi
14591459
14601460
# Check if the SDK version is already installed.
@@ -1475,7 +1475,7 @@ print_dry_run() {
14751475
14761476
resolved_version=${specific_versions[0]}
14771477
repeatable_command="./$script_name --version "\""$resolved_version"\"" --install-dir "\""$install_root"\"" --architecture "\""$normalized_architecture"\"" --os "\""$normalized_os"\"""
1478-
1478+
14791479
if [ ! -z "$normalized_quality" ]; then
14801480
repeatable_command+=" --quality "\""$normalized_quality"\"""
14811481
fi
@@ -1772,9 +1772,9 @@ do
17721772
echo " -q,--quality <quality> Download the latest build of specified quality in the channel."
17731773
echo " -Quality"
17741774
echo " The possible values are: daily, signed, validated, preview, GA."
1775-
echo " Works only in combination with channel. Not applicable for STS and LTS channels and will be ignored if those channels are used."
1776-
echo " For SDK use channel in A.B.Cxx format. Using quality for SDK together with channel in A.B format is not supported."
1777-
echo " Supported since 5.0 release."
1775+
echo " Works only in combination with channel. Not applicable for STS and LTS channels and will be ignored if those channels are used."
1776+
echo " For SDK use channel in A.B.Cxx format. Using quality for SDK together with channel in A.B format is not supported."
1777+
echo " Supported since 5.0 release."
17781778
echo " Note: The version parameter overrides the channel parameter when any version other than 'latest' is used, and therefore overrides the quality."
17791779
echo " --internal,-Internal Download internal builds. Requires providing credentials via --feed-credential parameter."
17801780
echo " --feed-credential <FEEDCREDENTIAL> Token to access Azure feed. Used as a query string to append to the Azure feed."

src/powershell/devcontainer-feature.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"id": "powershell",
3-
"version": "1.5.0",
3+
"version": "1.5.1",
44
"name": "PowerShell",
55
"documentationURL": "https://github.com/devcontainers/features/tree/main/src/powershell",
66
"description": "Installs PowerShell along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like gpg.",

src/python/devcontainer-feature.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"id": "python",
3-
"version": "1.6.4",
3+
"version": "1.6.5",
44
"name": "Python",
55
"documentationURL": "https://github.com/devcontainers/features/tree/main/src/python",
66
"description": "Installs the provided version of Python, as well as PIPX, and other common Python utilities. JupyterLab is conditionally installed with the python feature. Note: May require source code compilation.",

0 commit comments

Comments
 (0)