Skip to content

Commit 758b032

Browse files
authored
sync install.sh to devcontainer-feature.json default values (devcontainers#867)
* add default value to MOBYBUILDXVERSION Signed-off-by: Lucas Fernando Cardoso Nunes <lucasfc.nunes@gmail.com> * bump updated features patch versions Signed-off-by: Lucas Fernando Cardoso Nunes <lucasfc.nunes@gmail.com> * sync missing default values to `install.sh` find `^[A-Z0-9_]+="\$\{[^:]+?\}` on `install.sh` files Signed-off-by: Lucas Fernando Cardoso Nunes <lucasfc.nunes@gmail.com> --------- Signed-off-by: Lucas Fernando Cardoso Nunes <lucasfc.nunes@gmail.com>
1 parent f4f492c commit 758b032

9 files changed

Lines changed: 12 additions & 12 deletions

File tree

src/docker-in-docker/install.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010

1111
DOCKER_VERSION="${VERSION:-"latest"}" # The Docker/Moby Engine + CLI should match in version
1212
USE_MOBY="${MOBY:-"true"}"
13-
MOBY_BUILDX_VERSION="${MOBYBUILDXVERSION}"
13+
MOBY_BUILDX_VERSION="${MOBYBUILDXVERSION:-"0.12.0"}"
1414
DOCKER_DASH_COMPOSE_VERSION="${DOCKERDASHCOMPOSEVERSION:-"v1"}" # v1 or v2 or none
1515
AZURE_DNS_AUTO_DETECTION="${AZUREDNSAUTODETECTION:-"true"}"
16-
DOCKER_DEFAULT_ADDRESS_POOL="${DOCKERDEFAULTADDRESSPOOL}"
16+
DOCKER_DEFAULT_ADDRESS_POOL="${DOCKERDEFAULTADDRESSPOOL:-""}"
1717
USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
1818
INSTALL_DOCKER_BUILDX="${INSTALLDOCKERBUILDX:-"true"}"
1919
MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"

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.4.0",
3+
"version": "1.4.1",
44
"name": "Docker (docker-outside-of-docker)",
55
"documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-outside-of-docker",
66
"description": "Re-use 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/docker-outside-of-docker/install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
DOCKER_VERSION="${VERSION:-"latest"}"
1111
USE_MOBY="${MOBY:-"true"}"
12-
MOBY_BUILDX_VERSION="${MOBYBUILDXVERSION}"
12+
MOBY_BUILDX_VERSION="${MOBYBUILDXVERSION:-"0.12.0"}"
1313
DOCKER_DASH_COMPOSE_VERSION="${DOCKERDASHCOMPOSEVERSION:-"v1"}" # v1 or v2 or none
1414

1515
ENABLE_NONROOT_DOCKER="${ENABLE_NONROOT_DOCKER:-"true"}"

src/dotnet/devcontainer-feature.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"id": "dotnet",
3-
"version": "2.0.4",
3+
"version": "2.0.5",
44
"name": "Dotnet CLI",
55
"documentationURL": "https://github.com/devcontainers/features/tree/main/src/dotnet",
66
"description": "This Feature installs the latest .NET SDK, which includes the .NET CLI and the shared runtime. Options are provided to choose a different version or additional versions.",

src/dotnet/install.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
# Docs: https://github.com/devcontainers/features/tree/main/src/dotnet
88
# Maintainer: The Dev Container spec maintainers
99
DOTNET_VERSION="${VERSION:-"latest"}"
10-
ADDITIONAL_VERSIONS="${ADDITIONALVERSIONS}"
11-
DOTNET_RUNTIME_VERSIONS="${DOTNETRUNTIMEVERSIONS}"
12-
ASPNETCORE_RUNTIME_VERSIONS="${ASPNETCORERUNTIMEVERSIONS}"
10+
ADDITIONAL_VERSIONS="${ADDITIONALVERSIONS:-""}"
11+
DOTNET_RUNTIME_VERSIONS="${DOTNETRUNTIMEVERSIONS:-""}"
12+
ASPNETCORE_RUNTIME_VERSIONS="${ASPNETCORERUNTIMEVERSIONS:-""}"
1313

1414
set -e
1515

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.4.0",
3+
"version": "1.4.1",
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/java/install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ INSTALL_ANT="${INSTALLANT:-"false"}"
1818
ANT_VERSION="${ANTVERSION:-"latest"}"
1919
INSTALL_GROOVY="${INSTALLGROOVY:-"false"}"
2020
GROOVY_VERSION="${GROOVYVERSION:-"latest"}"
21-
JDK_DISTRO="${JDKDISTRO}"
21+
JDK_DISTRO="${JDKDISTRO:-"ms"}"
2222

2323
export SDKMAN_DIR="${SDKMAN_DIR:-"/usr/local/sdkman"}"
2424
USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"

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.3.0",
3+
"version": "1.3.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/powershell/install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ set -e
1313
rm -rf /var/lib/apt/lists/*
1414

1515
POWERSHELL_VERSION=${VERSION:-"latest"}
16-
POWERSHELL_MODULES="${MODULES}"
16+
POWERSHELL_MODULES="${MODULES:-""}"
1717
POWERSHELL_PROFILE_URL="${PROFILE_URL}"
1818

1919
MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"

0 commit comments

Comments
 (0)