sync install.sh to devcontainer-feature.json default values (#867)

* add default value to MOBYBUILDXVERSION Signed-off-by: Lucas Fernando Cardoso Nunes <[email protected]> * bump updated features patch versions Signed-off-by: Lucas Fernando Cardoso Nunes <[email protected]> * sync missing default values to `install.sh` find `^[A-Z0-9_]+="\$\{[^:]+?\}` on `install.sh` files Signed-off-by: Lucas Fernando Cardoso Nunes <[email protected]> --------- Signed-off-by: Lucas Fernando Cardoso Nunes <[email protected]>
devcontainers · Feb 23, 2024 · 758b032 · 758b032
1 parent f4f492c
commit 758b032
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 12 deletions.
diff --git a/src/docker-in-docker/install.sh b/src/docker-in-docker/install.sh
@@ -10,10 +10,10 @@
 
 DOCKER_VERSION="${VERSION:-"latest"}" # The Docker/Moby Engine + CLI should match in version
 USE_MOBY="${MOBY:-"true"}"
-MOBY_BUILDX_VERSION="${MOBYBUILDXVERSION}"
+MOBY_BUILDX_VERSION="${MOBYBUILDXVERSION:-"0.12.0"}"
 DOCKER_DASH_COMPOSE_VERSION="${DOCKERDASHCOMPOSEVERSION:-"v1"}" # v1 or v2 or none
 AZURE_DNS_AUTO_DETECTION="${AZUREDNSAUTODETECTION:-"true"}"
-DOCKER_DEFAULT_ADDRESS_POOL="${DOCKERDEFAULTADDRESSPOOL}"
+DOCKER_DEFAULT_ADDRESS_POOL="${DOCKERDEFAULTADDRESSPOOL:-""}"
 USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
 INSTALL_DOCKER_BUILDX="${INSTALLDOCKERBUILDX:-"true"}"
 MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"

diff --git a/src/docker-outside-of-docker/devcontainer-feature.json b/src/docker-outside-of-docker/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "docker-outside-of-docker",
-    "version": "1.4.0",
+    "version": "1.4.1",
     "name": "Docker (docker-outside-of-docker)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-outside-of-docker",
     "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.",

diff --git a/src/docker-outside-of-docker/install.sh b/src/docker-outside-of-docker/install.sh
@@ -9,7 +9,7 @@
 
 DOCKER_VERSION="${VERSION:-"latest"}"
 USE_MOBY="${MOBY:-"true"}"
-MOBY_BUILDX_VERSION="${MOBYBUILDXVERSION}"
+MOBY_BUILDX_VERSION="${MOBYBUILDXVERSION:-"0.12.0"}"
 DOCKER_DASH_COMPOSE_VERSION="${DOCKERDASHCOMPOSEVERSION:-"v1"}" # v1 or v2 or none
 
 ENABLE_NONROOT_DOCKER="${ENABLE_NONROOT_DOCKER:-"true"}"

diff --git a/src/dotnet/devcontainer-feature.json b/src/dotnet/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "dotnet",
-    "version": "2.0.4",
+    "version": "2.0.5",
     "name": "Dotnet CLI",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/dotnet",
     "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.",

diff --git a/src/dotnet/install.sh b/src/dotnet/install.sh
@@ -7,9 +7,9 @@
 # Docs: https://github.com/devcontainers/features/tree/main/src/dotnet
 # Maintainer: The Dev Container spec maintainers
 DOTNET_VERSION="${VERSION:-"latest"}"
-ADDITIONAL_VERSIONS="${ADDITIONALVERSIONS}"
-DOTNET_RUNTIME_VERSIONS="${DOTNETRUNTIMEVERSIONS}"
-ASPNETCORE_RUNTIME_VERSIONS="${ASPNETCORERUNTIMEVERSIONS}"
+ADDITIONAL_VERSIONS="${ADDITIONALVERSIONS:-""}"
+DOTNET_RUNTIME_VERSIONS="${DOTNETRUNTIMEVERSIONS:-""}"
+ASPNETCORE_RUNTIME_VERSIONS="${ASPNETCORERUNTIMEVERSIONS:-""}"
 
 set -e
 

diff --git a/src/java/devcontainer-feature.json b/src/java/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "java",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "name": "Java (via SDKMAN!)",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/java",
   "description": "Installs Java, SDKMAN! (if not installed), and needed dependencies.",

diff --git a/src/java/install.sh b/src/java/install.sh
@@ -18,7 +18,7 @@ INSTALL_ANT="${INSTALLANT:-"false"}"
 ANT_VERSION="${ANTVERSION:-"latest"}"
 INSTALL_GROOVY="${INSTALLGROOVY:-"false"}"
 GROOVY_VERSION="${GROOVYVERSION:-"latest"}"
-JDK_DISTRO="${JDKDISTRO}"
+JDK_DISTRO="${JDKDISTRO:-"ms"}"
 
 export SDKMAN_DIR="${SDKMAN_DIR:-"/usr/local/sdkman"}"
 USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"

diff --git a/src/powershell/devcontainer-feature.json b/src/powershell/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "powershell",
-    "version": "1.3.0",
+    "version": "1.3.1",
     "name": "PowerShell",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/powershell",
     "description": "Installs PowerShell along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like gpg.",

diff --git a/src/powershell/install.sh b/src/powershell/install.sh
@@ -13,7 +13,7 @@ set -e
 rm -rf /var/lib/apt/lists/*
 
 POWERSHELL_VERSION=${VERSION:-"latest"}
-POWERSHELL_MODULES="${MODULES}"
+POWERSHELL_MODULES="${MODULES:-""}"
 POWERSHELL_PROFILE_URL="${PROFILE_URL}"
 
 MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"