Move extensions and settings under customizations.vscode (#97)

* move extensions and settings under customizations

* nit

* bump versions

.github/workflows/release.yaml

@@ -1,6 +1,9 @@
 name: "(Release) Release dev container features (v2)"
 on:
   workflow_dispatch:
+  push:
+    branches:
+      - main
 
 jobs:
   deploy:

src/aws-cli/devcontainer-feature.json

@@ -1,6 +1,6 @@
 {
     "id": "aws-cli",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "name": "AWS CLI",
     "description": "Installs the AWS CLI along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like gpg.",
     "options": {
@@ -13,7 +13,11 @@
             "description": "Select or enter an AWS CLI version. (Available versions here: https://github.com/aws/aws-cli/blob/v2/CHANGELOG.rst)"
         }
     },
+    "customizations": {
+        "vscode": {
             "extensions": [
                 "AmazonWebServices.aws-toolkit-vscode"
             ]
         }
+    }
+}

src/azure-cli/devcontainer-feature.json

@@ -1,6 +1,6 @@
 {
   "id": "azure-cli",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "name": "Azure CLI",
   "description": "Installs the Azure CLI along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like gpg.",
   "options": {
@@ -13,7 +13,11 @@
       "description": "Select or enter an Azure CLI version. (Available versions may vary by Linux distribution.)"
     }
   },
+  "customizations": {
+      "vscode": {
           "extensions": [
             "ms-vscode.azurecli"
           ]
       }
+  }
+}

src/common-utils/devcontainer-feature.json

@@ -1,7 +1,7 @@
 {
     "id": "common-utils",
     "name": "Common Debian Utilities",
-    "version": "1.0.1",
+    "version": "1.0.2",
     "description": "Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-root user.",
     "options": {
         "installZsh": {
@@ -54,7 +54,11 @@
             "description": "Add packages from non-free Debian repository?"
         }
     },
+    "customizations": {
+        "vscode": {
             "extensions": [
                 "ms-dotnettools.csharp"
             ]
         }
+    }
+}

src/docker-from-docker/devcontainer-feature.json

@@ -1,6 +1,6 @@
 {
     "id": "docker-from-docker",
-    "version": "1.0.1",
+    "version": "1.0.2",
     "name": "Docker (Docker-from-Docker)",
     "descripton": "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.",
     "options": {
@@ -33,9 +33,13 @@
     "containerEnv": {
         "DOCKER_BUILDKIT": "1"
     },
+    "customizations": {
+        "vscode": {
             "extensions": [
                 "ms-azuretools.vscode-docker"
-    ],
+            ]
+        }
+    },
     "mounts": [
         {
             "source": "/var/run/docker.sock",

src/docker-in-docker/devcontainer-feature.json

@@ -1,6 +1,6 @@
 {
     "id": "docker-in-docker",
-    "version": "1.0.1",
+    "version": "1.0.2",
     "name": "Docker (Docker-in-Docker)",
     "description": "Create child containers *inside* a container, independent from the host's docker instance. Installs Docker extension in the container along with needed CLIs.",
     "options": {
@@ -34,9 +34,13 @@
     "containerEnv": {
         "DOCKER_BUILDKIT": "1"
     },
+    "customizations": {
+        "vscode": {
             "extensions": [
                 "ms-azuretools.vscode-docker"
-    ],
+            ]
+        }
+    },
     "mounts": [
         {
             "source": "dind-var-lib-docker",

src/dotnet/devcontainer-feature.json

@@ -1,6 +1,6 @@
 {
     "id": "dotnet",
-    "version": "1.0.1",
+    "version": "1.0.2",
     "name": "Dotnet CLI",
     "description": "Installs the .NET CLI. Provides option of installing sdk or runtime, and option of versions to install. Uses latest version of .NET sdk as defaults to install.",
     "options": {
@@ -30,7 +30,11 @@
         "DOTNET_ROOT": "/usr/local/dotnet/current",
         "PATH": "${PATH}:${DOTNET_ROOT}"
     },
+    "customizations": {
+        "vscode": {
             "extensions": [
                 "ms-dotnettools.csharp"
             ]
         }
+    }
+}

src/go/devcontainer-feature.json

@@ -1,6 +1,6 @@
 {
     "id": "go",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "name": "Go",
     "description": "Installs Go and common Go utilities. Auto-detects latest version and installs needed dependencies.",
     "options": {
@@ -17,9 +17,13 @@
         }
     },
     "init": true,
+    "customizations": {
+        "vscode": {
             "extensions": [
                 "golang.Go"
-    ],
+            ]
+        }
+    },
     "containerEnv": {
         "GOPATH": "/usr/local/go",
         "PATH": "${GOPATH}/bin:${PATH}"

src/java/devcontainer-feature.json

@@ -1,6 +1,6 @@
 {
   "id": "java",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "name": "Java (via SDKMAN!)",
   "description": "Installs Java, SDKMAN! (if not installed), and needed dependencies.",
   "options": {
@@ -28,16 +28,20 @@
     }
   },
   "buildArg": "_VSC_INSTALL_JAVA",
+  "customizations": {
+    "vscode": {
       "extensions": [
         "vscjava.vscode-java-pack"
       ],
+      "settings": {
+        "java.import.gradle.java.home": "/usr/local/sdkman/candidates/java/current"
+      }
+    }
+  },
   "containerEnv": {
     "SDKMAN_DIR": "/usr/local/sdkman",
     "GRADLE_USER_HOME": "${HOME}/.gradle",
     "M2": "${HOME}/.m2",
     "PATH": "${SDKMAN_DIR}/bin:${SDKMAN_DIR}/candidates/java/current/bin:${SDKMAN_DIR}/candidates/gradle/current/bin:${SDKMAN_DIR}/candidates/maven/current/bin:${PATH}"
-  },
-  "settings": {
-    "java.import.gradle.java.home": "/usr/local/sdkman/candidates/java/current"
   }
 }

src/kubectl-helm-minikube/devcontainer-feature.json

@@ -1,6 +1,6 @@
 {
     "id": "kubectl-helm-minikube",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "name": "Kubectl, Helm, and Minkube",
     "description": "Installs latest version of kubectl, Helm, and optionally minikube. Auto-detects latest versions and installs needed dependencies.",
     "options": {
@@ -33,9 +33,13 @@
             "description": "Select or enter a Minikube version to install"
         }
     },
+    "customizations": {
+        "vscode": {
             "extensions": [
                 "ms-kubernetes-tools.vscode-kubernetes-tools"
-    ],
+            ]
+        }
+    },
     "mounts": [
         {
             "source": "minikube-config",

src/node/devcontainer-feature.json

@@ -1,6 +1,6 @@
 {
     "id": "node",
-    "version": "1.0.1",
+    "version": "1.0.2",
     "name": "Node.js (via nvm) and yarn",
     "description": "Installs Node.js, nvm, yarn, and needed dependencies.",
     "options": {
@@ -28,9 +28,13 @@
             "description": "The path where NVM will be installed."
         }
     },
+    "customizations": {
+        "vscode": {
             "extensions": [
                 "dbaeumer.vscode-eslint"
-    ],
+            ]
+        }
+    },
     "containerEnv": {
         "NVM_DIR": "/usr/local/share/nvm",
         "NVM_SYMLINK_CURRENT": "true",

src/php/devcontainer-feature.json

@@ -1,6 +1,6 @@
 {
     "id": "php",
-    "version": "1.0.1",
+    "version": "1.0.2",
     "name": "PHP",
     "options": {
         "version": {
@@ -18,12 +18,16 @@
             "description": "Install PHP Composer?"
         }
     },
+    "customizations": {
+        "vscode": {
             "extensions": [
                 "xdebug.php-debug",
                 "bmewburn.vscode-intelephense-client",
                 "xdebug.php-pack",
                 "devsense.phptools-vscode"
-    ],
+            ]
+        }
+    },
     "containerEnv": {
         "PHP_PATH": "/usr/local/php/current",
         "PATH": "${PHP_PATH}/bin:${PATH}"

src/python/devcontainer-feature.json

@@ -1,6 +1,6 @@
 {
   "id": "python",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "name": "Python",
   "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.",
   "options": {
@@ -51,6 +51,8 @@
     "PIPX_BIN_DIR": "/usr/local/py-utils/bin",
     "PATH": "${PYTHON_PATH}/bin:${PATH}:${PIPX_BIN_DIR}"
   },
+  "customizations": {
+    "vscode": {
       "extensions": [
         "ms-python.python",
         "ms-python.vscode-pylance"
@@ -68,3 +70,5 @@
         "python.linting.pylintPath": "/usr/local/py-utils/bin/pylint"
       }
     }
+  }
+}

src/ruby/devcontainer-feature.json

@@ -1,6 +1,6 @@
 {
     "id": "ruby",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "name": "Ruby (via rvm)",
     "description": "Installs Ruby, rvm, rbenv, common Ruby utilities, and needed dependencies.",
     "options": {
@@ -17,9 +17,13 @@
             "description": "Select or enter a Ruby version to install"
         }
     },
+    "customizations": {
+        "vscode": {
             "extensions": [
                 "rebornix.Ruby"
-    ],
+            ]
+        }
+    },
     "containerEnv": {
         "GEM_PATH": "/usr/local/rvm/gems/default:/usr/local/rvm/gems/default@global",
         "GEM_HOME": "/usr/local/rvm/gems/default",

src/rust/devcontainer-feature.json

@@ -1,6 +1,6 @@
 {
     "id": "rust",
-    "version": "1.0.1",
+    "version": "1.0.2",
     "name": "Rust",
     "description": "Installs Rust, common Rust utilities, and their required dependencies",
     "options": {
@@ -27,6 +27,8 @@
             "description": "Select a rustup install profile."
         }
     },
+    "customizations": {
+        "vscode": {
             "extensions": [
                 "vadimcn.vscode-lldb",
                 "mutantdino.resourcemonitor",
@@ -34,6 +36,15 @@
                 "tamasfe.even-better-toml",
                 "serayuzgur.crates"
             ],
+            "settings": {
+                "lldb.executable": "/usr/bin/lldb",
+                "files.watcherExclude": {
+                    "**/target/**": true
+                },
+                "rust-analyzer.checkOnSave.command": "clippy"
+            }
+        }
+    },
     "containerEnv": {
         "CARGO_HOME": "/usr/local/cargo",
         "RUSTUP_HOME": "/usr/local/rustup",
@@ -44,12 +55,5 @@
     ],
     "securityOpt": [
         "seccomp=unconfined"
-    ],
+    ]
-    "settings": {
-        "lldb.executable": "/usr/bin/lldb",
-        "files.watcherExclude": {
-            "**/target/**": true
-        },
-        "rust-analyzer.checkOnSave.command": "clippy"
-    }
 }

src/terraform/devcontainer-feature.json

@@ -1,6 +1,6 @@
 {
     "id": "terraform",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "name": "Terraform, tflint, and TFGrunt",
     "description": "Installs the Terraform CLI and optionally TFLint and Terragrunt. Auto-detects latest version and installs needed dependencies.",
     "options": {
@@ -33,6 +33,8 @@
             "description": "Terragrunt version"
         }
     },
+    "customizations": {
+        "vscode": {
             "extensions": [
                 "HashiCorp.terraform",
                 "ms-azuretools.vscode-azureterraform"
@@ -45,3 +47,5 @@
                 "azureTerraform.terminal": "integrated"
             }
         }
+    }
+}