From 26246453d16862314a6ec712965b0dd50b7ce63e Mon Sep 17 00:00:00 2001 From: Chuck Lantz Date: Fri, 28 Aug 2020 18:59:00 -0700 Subject: [PATCH] Add comments for options, community definitions (#526) --- build/config.json | 2 +- build/vscdc | 21 ++++++++++++++ .../.devcontainer/devcontainer.json | 6 +--- .../.devcontainer/docker-compose.yml | 28 +++++++++++-------- container-templates/docker-compose/README.md | 8 ++++++ .../azure-ansible/.devcontainer/Dockerfile | 4 ++- .../.devcontainer/devcontainer.json | 2 +- .../.devcontainer/devcontainer.json | 2 +- .../azure-terraform/.devcontainer/Dockerfile | 4 ++- .../.devcontainer/devcontainer.json | 2 +- .../bash/.devcontainer/devcontainer.json | 14 +++++----- .../bazel/.devcontainer/devcontainer.json | 2 +- .../codespaces-linux/.devcontainer/Dockerfile | 4 ++- .../.devcontainer/base.Dockerfile | 6 ++-- .../.devcontainer/devcontainer.json | 2 +- .../library-scripts/gradle-debian.sh | 2 +- containers/codespaces-linux/README.md | 12 ++++---- .../.devcontainer/Dockerfile | 4 +-- .../.devcontainer/devcontainer.json | 2 +- containers/dapr-dotnetcore-3.1/README.md | 18 +++++++----- .../.devcontainer/devcontainer.json | 2 +- .../debian/.devcontainer/base.Dockerfile | 2 +- .../.devcontainer/Dockerfile | 4 +-- containers/dotnetcore-fsharp/README.md | 4 +-- .../dotnetcore/.devcontainer/Dockerfile | 4 +-- .../dotnetcore/.devcontainer/base.Dockerfile | 4 +-- .../elm/.devcontainer/devcontainer.json | 2 +- containers/go/.devcontainer/Dockerfile | 2 +- containers/go/.devcontainer/base.Dockerfile | 2 +- .../hugo/.devcontainer/devcontainer.json | 2 +- containers/java-8/.devcontainer/Dockerfile | 5 ++-- containers/java-8/README.md | 2 +- containers/java/.devcontainer/Dockerfile | 5 ++-- containers/java/.devcontainer/base.Dockerfile | 5 ++-- containers/jekyll/.devcontainer/Dockerfile | 2 +- .../jekyll/.devcontainer/devcontainer.json | 2 +- containers/kubernetes-helm/README.md | 2 +- .../perl/.devcontainer/devcontainer.json | 2 +- containers/php/.devcontainer/Dockerfile | 2 +- containers/php/.devcontainer/base.Dockerfile | 2 +- .../puppet/.devcontainer/devcontainer.json | 2 +- .../.devcontainer/devcontainer.json | 2 +- containers/python-3/.devcontainer/Dockerfile | 2 +- .../python-3/.devcontainer/base.Dockerfile | 2 +- containers/r/.devcontainer/devcontainer.json | 2 +- .../reasonml/.devcontainer/devcontainer.json | 2 +- .../ruby-rails/.devcontainer/Dockerfile | 2 +- .../ruby-sinatra/.devcontainer/Dockerfile | 2 +- .../.devcontainer/devcontainer.json | 2 +- containers/swift/.devcontainer/Dockerfile | 2 +- .../vue/.devcontainer/devcontainer.json | 5 ++-- 51 files changed, 135 insertions(+), 92 deletions(-) diff --git a/build/config.json b/build/config.json index 34d2028d..9474faf3 100644 --- a/build/config.json +++ b/build/config.json @@ -26,6 +26,6 @@ "scriptLibraryFolderNameInDefinition": "library-scripts", "definitionBuildConfigFile": "definition-manifest.json", - "devContainerJsonPreamble": "For format details, see https://aka.ms/vscode-remote/devcontainer.json or this file's README at:\n// ", + "devContainerJsonPreamble": "For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:\n// ", "dockerFilePreamble": "See here for image contents: " } diff --git a/build/vscdc b/build/vscdc index e094d894..130ae8a3 100755 --- a/build/vscdc +++ b/build/vscdc @@ -223,6 +223,9 @@ function pushCommand(argv) { argv.stubRegistryPath, argv.push, argv.prepOnly, argv.skip, argv.page, argv.pageTotal, argv.replaceImages, argv.devcontainer) .catch((reason) => { console.error(`(!) Push failed - ${reason}`); + if(reason.stack) { + console.error(` ${reason.stack}`); + } process.exit(1); }); } @@ -232,6 +235,9 @@ function packCommand(argv) { argv.stubRegistry, argv.stubRegistryPath, argv.prepAndPackageOnly, argv.packageOnly, argv.clean, argv.skipPush) .catch((reason) => { console.error(`(!) Packaging failed - ${reason}`); + if(reason.stack) { + console.error(` ${reason.stack}`); + } process.exit(1); }); } @@ -240,6 +246,9 @@ function updateScriptSourcesCommand(argv) { prep.updateAllScriptSourcesInRepo(argv.githubRepo, argv.release, argv.updateSha) .catch((reason) => { console.error(`(!) Failed to update script sources - ${reason}`); + if(reason.stack) { + console.error(` ${reason.stack}`); + } process.exit(1); }); } @@ -248,6 +257,9 @@ function copyLibraryScriptsCommand() { prep.copyLibraryScriptsForAllDefinitions() .catch((reason) => { console.error(`(!) Failed to copy library scripts to definitions - ${reason}`); + if(reason.stack) { + console.error(` ${reason.stack}`); + } process.exit(1); }); } @@ -257,6 +269,9 @@ function cgCommand(argv) { generateComponentGovernanceManifest(argv.githubRepo, argv.release, argv.registry, argv.registryPath, argv.build, argv.prune, argv.devcontainer) .catch((reason) => { console.error(`(!) Component governance manifest generation failed - ${reason}`); + if(reason.stack) { + console.error(` ${reason.stack}`); + } process.exit(1); }); } @@ -266,12 +281,18 @@ function patchCommand(argv) { patch.patchAll(argv.registry, argv.registryPath) .catch((reason) => { console.error(`(!) Patching failed - ${reason}`); + if(reason.stack) { + console.error(` ${reason.stack}`); + } process.exit(1); }); } else { patch.patch(argv.patchPath, argv.registry, argv.registryPath) .catch((reason) => { console.error(`(!) Patching failed - ${reason}`); + if(reason.stack) { + console.error(` ${reason.stack}`); + } process.exit(1); }); } diff --git a/container-templates/docker-compose/.devcontainer/devcontainer.json b/container-templates/docker-compose/.devcontainer/devcontainer.json index b4cab4a1..6d3cf513 100644 --- a/container-templates/docker-compose/.devcontainer/devcontainer.json +++ b/container-templates/docker-compose/.devcontainer/devcontainer.json @@ -6,7 +6,7 @@ // The 'service' property is the name of the service for the container that VS Code should // use. Update this value and .devcontainer/docker-compose.yml to the real service name. - "service": "your-service-name-here", + "service": "app", // The optional 'workspaceFolder' property is the path VS Code should open by default when // connected. This is typically a volume mount in .devcontainer/docker-compose.yml @@ -20,9 +20,6 @@ // Add the IDs of extensions you want installed when the container is created. "extensions": [] - // Uncomment the next line if you want start specific services in your Docker Compose config. - // "runServices": [], - // Uncomment the next line if you want to keep your containers running after VS Code shuts down. // "shutdownAction": "none", @@ -30,6 +27,5 @@ // "postCreateCommand": "uname -a", // Uncomment the next line to connect as a non-root user. - // See https://aka.ms/vscode-remote/containers/non-root. // "remoteUser": "vscode" } diff --git a/container-templates/docker-compose/.devcontainer/docker-compose.yml b/container-templates/docker-compose/.devcontainer/docker-compose.yml index 68573460..8a82c5bd 100644 --- a/container-templates/docker-compose/.devcontainer/docker-compose.yml +++ b/container-templates/docker-compose/.devcontainer/docker-compose.yml @@ -1,10 +1,7 @@ version: '3' -services: - your-service-name-here: - # Uncomment the next line to use a non-root user for all processes. - # See https://aka.ms/vscode-remote/containers/non-root for details. - # user: vscode +services: + app: # Using a Dockerfile is optional, but included for completeness. build: context: . @@ -13,13 +10,14 @@ services: args: VARIANT: buster - # Uncomment to expose one or more ports - # ports: - # - "3000:3000" - + # Use "forwardPorts" in **devcontainer.json** to forward an app port locally. + # (Adding the "ports" property to this file will not forward from a Codespace.) + + # Uncomment the next line to use a non-root user for all processes - See https://aka.ms/vscode-remote/containers/non-root for details. + # user: vscode + volumes: - # This is where VS Code should expect to find your project's source code - # and the value of "workspaceFolder" in .devcontainer/devcontainer.json + # This is where VS Code should expect to find your project's source code and the value of "workspaceFolder" in .devcontainer/devcontainer.json - ..:/workspace:cached # Uncomment the next line to use Docker from inside the container. See https://aka.ms/vscode-remote/samples/docker-from-docker-compose for details. @@ -34,3 +32,11 @@ services: # Overrides default command so things don't shut down after the process ends. command: /bin/sh -c "while sleep 1000; do :; done" + # You can include other services not opened by VS Code as well + another-service: + image: debian:latest + restart: unless-stopped + + # This causes the service to run on the same network as the app container, allows "forwardPorts" in devcontainer.json function. + network_mode: service:your-service-name-here + \ No newline at end of file diff --git a/container-templates/docker-compose/README.md b/container-templates/docker-compose/README.md index c75a73a0..804702e4 100644 --- a/container-templates/docker-compose/README.md +++ b/container-templates/docker-compose/README.md @@ -27,6 +27,14 @@ args: VARIANT: buster ``` +### Adding another service + +You can add other services to your `docker-compose.yml` file [as described in Docker's documentaiton](https://docs.docker.com/compose/compose-file/#service-configuration-reference). However, if you want anything running in this service to be available in the container on localhost, or want to forward the service locally, be sure to add this line to the service config: + +```yaml +# Runs the service on the same network as the app container, allows "forwardPorts" in devcontainer.json function. +network_mode: service:app + ### Adding the definition to your project 1. If this is your first time using a development container, please follow the [getting started steps](https://aka.ms/vscode-remote/containers/getting-started) to set up your machine. diff --git a/containers/azure-ansible/.devcontainer/Dockerfile b/containers/azure-ansible/.devcontainer/Dockerfile index 2d0e9bbc..43856fad 100644 --- a/containers/azure-ansible/.devcontainer/Dockerfile +++ b/containers/azure-ansible/.devcontainer/Dockerfile @@ -17,9 +17,11 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ # Install Ansible RUN pip3 install ansible[azure] -# Optional installs. Use a separate RUN statement to add your own dependencies. +# [Option] Install Azure CLI ARG INSTALL_AZURE_CLI="true" +# [Option] Install Docker CLI ARG INSTALL_DOCKER="true" +# [Option] Install Node.js ARG INSTALL_NODE="true" ARG NODE_VERSION="lts/*" ENV NVM_DIR=/usr/local/share/nvm diff --git a/containers/azure-ansible/.devcontainer/devcontainer.json b/containers/azure-ansible/.devcontainer/devcontainer.json index 4a3b0a0f..d7e87c77 100644 --- a/containers/azure-ansible/.devcontainer/devcontainer.json +++ b/containers/azure-ansible/.devcontainer/devcontainer.json @@ -1,5 +1,5 @@ { - "name": "Azure Ansible", + "name": "Azure Ansible (Community)", "build": { "dockerfile": "Dockerfile", "args": { diff --git a/containers/azure-blockchain/.devcontainer/devcontainer.json b/containers/azure-blockchain/.devcontainer/devcontainer.json index b58caeac..81818f58 100644 --- a/containers/azure-blockchain/.devcontainer/devcontainer.json +++ b/containers/azure-blockchain/.devcontainer/devcontainer.json @@ -1,5 +1,5 @@ { - "name": "Azure Blockchain", + "name": "Azure Blockchain (Community)", "dockerFile": "Dockerfile", // Set *default* container specific settings.json values on container create. diff --git a/containers/azure-terraform/.devcontainer/Dockerfile b/containers/azure-terraform/.devcontainer/Dockerfile index 12fe9cdf..6c92026b 100644 --- a/containers/azure-terraform/.devcontainer/Dockerfile +++ b/containers/azure-terraform/.devcontainer/Dockerfile @@ -14,9 +14,11 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ && apt-get install -y graphviz \ && apt-get clean -y && rm -rf /var/lib/apt/lists/* -# Optional installs. Use a separate RUN statement to add your own dependencies. +# [Option] Install Azure CLI ARG INSTALL_AZURE_CLI="true" +# [Option] Install Docker CLI ARG INSTALL_DOCKER="true" +# [Option] Install Node.js ARG INSTALL_NODE="true" ARG NODE_VERSION="lts/*" ENV NVM_DIR=/usr/local/share/nvm diff --git a/containers/azure-terraform/.devcontainer/devcontainer.json b/containers/azure-terraform/.devcontainer/devcontainer.json index ffbb238e..5b206958 100644 --- a/containers/azure-terraform/.devcontainer/devcontainer.json +++ b/containers/azure-terraform/.devcontainer/devcontainer.json @@ -1,5 +1,5 @@ { - "name": "Azure Terraform", + "name": "Azure Terraform (Community)", "build": { "dockerfile": "Dockerfile", "args": { diff --git a/containers/bash/.devcontainer/devcontainer.json b/containers/bash/.devcontainer/devcontainer.json index 1e455021..75acd9ec 100644 --- a/containers/bash/.devcontainer/devcontainer.json +++ b/containers/bash/.devcontainer/devcontainer.json @@ -1,24 +1,24 @@ { - "name": "Bash", + "name": "Bash (Community)", "dockerfile": "Dockerfile", + // Set *default* container specific settings.json values on container create. "settings": { "terminal.integrated.shell.linux": "/bin/bash" }, + // Add the IDs of extensions you want installed when the container is created. "extensions": [ "mads-hartmann.bash-ide-vscode", "rogalmic.bash-debug" ], + // Use 'forwardPorts' to make a list of ports inside the container available locally. "forwardPorts": [], + // Use 'postCreateCommand' to run commands after the container is created. // "postCreateCommand": "uname -a", - // Uncomment to use Docker from inside the container. See https://aka.ms/vscode-remote/samples/docker-from-docker. - // "mounts": [ "source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind" ], - // Uncomment when using a ptrace-based debugger like C++, Go, and Rust - // "runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ], + // Uncomment to connect as a non-root user. See https://aka.ms/vscode-remote/containers/non-root. - "remoteUser": "vscode", - "dockerFile": "Dockerfile" + "remoteUser": "vscode" } \ No newline at end of file diff --git a/containers/bazel/.devcontainer/devcontainer.json b/containers/bazel/.devcontainer/devcontainer.json index 6a005554..cb29bdf1 100644 --- a/containers/bazel/.devcontainer/devcontainer.json +++ b/containers/bazel/.devcontainer/devcontainer.json @@ -1,5 +1,5 @@ { - "name": "Bazel", + "name": "Bazel (Community)", "build": { "dockerfile": "Dockerfile", "args": { diff --git a/containers/codespaces-linux/.devcontainer/Dockerfile b/containers/codespaces-linux/.devcontainer/Dockerfile index 15d064b3..5b33228b 100644 --- a/containers/codespaces-linux/.devcontainer/Dockerfile +++ b/containers/codespaces-linux/.devcontainer/Dockerfile @@ -1,7 +1,8 @@ FROM mcr.microsoft.com/vscode/devcontainers/universal:linux -# [Optional] Install Docker USER root + +# [Option] Install Docker CLI ARG INSTALL_DOCKER="false" COPY library-scripts/docker-debian.sh /tmp/library-scripts/ RUN if [ "${INSTALL_DOCKER}" = "true" ]; then \ @@ -10,6 +11,7 @@ RUN if [ "${INSTALL_DOCKER}" = "true" ]; then \ echo '#!/bin/bash\nexec "$@"' > /usr/local/share/docker-init.sh && chmod +x /usr/local/share/docker-init.sh; \ fi \ && rm -rf /var/lib/apt/lists/* /tmp/library-scripts/ + USER codespace # ** [Optional] Uncomment this section to install additional packages. ** diff --git a/containers/codespaces-linux/.devcontainer/base.Dockerfile b/containers/codespaces-linux/.devcontainer/base.Dockerfile index d678312c..827c396a 100644 --- a/containers/codespaces-linux/.devcontainer/base.Dockerfile +++ b/containers/codespaces-linux/.devcontainer/base.Dockerfile @@ -86,7 +86,7 @@ ENV CARGO_HOME="/usr/local/cargo" \ RUSTUP_HOME="/usr/local/rustup" ENV PATH="${CARGO_HOME}/bin:${PATH}" COPY library-scripts/rust-debian.sh /tmp/scripts/ -RUN bash /tmp/scripts/rust-debian.sh "${CARGO_HOME}" "${RUSTUP_HOME}" "${USERNAME}" "false" \ +RUN bash /tmp/scripts/rust-debian.sh "${CARGO_HOME}" "${RUSTUP_HOME}" "${USERNAME}" "true" \ && apt-get clean -y && rm -rf /tmp/scripts # Install Go @@ -109,7 +109,7 @@ ENV PIPX_HOME="/usr/local/py-utils" \ PIPX_BIN_DIR="/usr/local/py-utils/bin" ENV PATH="${PATH}:${PIPX_BIN_DIR}" COPY library-scripts/python-debian.sh /tmp/scripts/ -RUN bash /tmp/scripts/python-debian.sh "stable" "/opt/python/stable" "${PIPX_HOME}" "${USERNAME}" "false" \ +RUN bash /tmp/scripts/python-debian.sh "stable" "/opt/python/stable" "${PIPX_HOME}" "${USERNAME}" "true" \ && apt-get clean -y && rm -rf /tmp/scripts # Install xdebug, link composer @@ -121,7 +121,7 @@ RUN yes | pecl install xdebug \ && rm -rf /tmp/pear \ && ln -s $(which composer.phar) /usr/local/bin/composer -# [Optional] Install Docker - Not in resulting image by default +# [Option] Install Docker CLI ARG INSTALL_DOCKER="false" COPY library-scripts/docker-debian.sh /tmp/scripts/ RUN if [ "${INSTALL_DOCKER}" = "true" ]; then \ diff --git a/containers/codespaces-linux/.devcontainer/devcontainer.json b/containers/codespaces-linux/.devcontainer/devcontainer.json index c95dca71..beb56f29 100644 --- a/containers/codespaces-linux/.devcontainer/devcontainer.json +++ b/containers/codespaces-linux/.devcontainer/devcontainer.json @@ -1,5 +1,5 @@ { - "name": "Codespaces", + "name": "GitHub Codespaces (Default)", "build": { "dockerfile": "Dockerfile", "args": { diff --git a/containers/codespaces-linux/.devcontainer/library-scripts/gradle-debian.sh b/containers/codespaces-linux/.devcontainer/library-scripts/gradle-debian.sh index 07314e68..534eca57 100644 --- a/containers/codespaces-linux/.devcontainer/library-scripts/gradle-debian.sh +++ b/containers/codespaces-linux/.devcontainer/library-scripts/gradle-debian.sh @@ -58,5 +58,5 @@ fi # Install gradle su ${USERNAME} -c "source ${SDKMAN_DIR}/bin/sdkman-init.sh && sdk install gradle ${GRADLE_VERSION} && sdk flush archives && sdk flush temp" -updaterc "export GRADLER_USER_HOME=\${HOME}/.gradle" +updaterc "export GRADLE_USER_HOME=\${HOME}/.gradle" echo "Done!" diff --git a/containers/codespaces-linux/README.md b/containers/codespaces-linux/README.md index f60e107e..769d9db4 100644 --- a/containers/codespaces-linux/README.md +++ b/containers/codespaces-linux/README.md @@ -1,12 +1,12 @@ -# Visual Studio Codespaces (Linux Universal) +# GitHub Codespaces (Default Linux Universal) ## Summary -*Use or extend the large, universal, multi-language development container for Visual Studio Codespaces.* +*Use or extend the default large, multi-language "universal" container for GitHub Codespaces.* | Metadata | Value | |----------|-------| -| *Contributors* | The VS / GitHub Codespaces and VS Code teams | +| *Contributors* | The GitHub Codespaces and VS Code teams | | *Definition type* | Dockerfile | | *Published image* | mcr.microsoft.com/vscode/devcontainers/universal:linux | | *Published image architecture(s)* | x86-64 | @@ -16,9 +16,9 @@ ## Description -While language specific development containers can be useful, in some cases you may want to use more than one in a project without having to set them all up. In other cases you may be looking to create a general "sandbox" container you intend to use with multiple projects or repositories. The large container image generated here (`mcr.microsoft.com/vscode/devcontainers/universal:linux`) includes a number of runtime versions for popular languages lke Python, Node, PHP, Java, Go, C++, and .NET Core/C# - many of which are [inherited from the Oryx build image](https://github.com/microsoft/oryx#supported-platforms) it is based on. +While language specific development containers can be useful, in some cases you may want to use more than one in a project without having to set them all up. In other cases you may be looking to create a general "sandbox" container you intend to use with multiple projects or repositories. The large container image generated here (`mcr.microsoft.com/vscode/devcontainers/universal:linux`) includes a number of runtime versions for popular languages lke Python, Node, PHP, Java, Go, C++, Ruby, Go, Rust and .NET Core/C# - many of which are [inherited from the Oryx build image](https://github.com/microsoft/oryx#supported-platforms) it is based on. -If you use Visual Studio Codespaces or GitHub Codespaces, this is the "universal" image that is used by default if no custom Dockerfile or image is specified. If you like what you see but want to make a few additions or changes, you can use a custom Dockerfile to extend it and add whatever you need. +If you use GitHub Codespaces, this is the "universal" image that is used by default if no custom Dockerfile or image is specified. If you like what you see but want to make a few additions or changes, you can use a custom Dockerfile to extend it and add whatever you need. The container includes the `zsh` (and Oh My Zsh!) and `fish` shells that you can opt into using instead of the default `bash`. It also includes [nvm](https://github.com/nvm-sh/nvm) and [nvs](https://github.com/jasongin/nvs) if you need to install a different version of Node.js than those that are in the container by default. @@ -26,7 +26,7 @@ The container includes the `zsh` (and Oh My Zsh!) and `fish` shells that you can While the definition itself works unmodified, you can also directly reference pre-built versions of `.devcontainer/Dockerfile` by using the `image` property in `.devcontainer/devcontainer.json` or updating the `FROM` statement in your own `Dockerfile` to: -` mcr.microsoft.com/vscode/devcontainers/universal:linux` +`mcr.microsoft.com/vscode/devcontainers/universal:linux` Alternatively, you can use the contents of the `Dockerfile` to fully customize your container's contents or to build it for a container host architecture not supported by the image. diff --git a/containers/dapr-dotnetcore-3.1/.devcontainer/Dockerfile b/containers/dapr-dotnetcore-3.1/.devcontainer/Dockerfile index 4d47468d..9baaff40 100644 --- a/containers/dapr-dotnetcore-3.1/.devcontainer/Dockerfile +++ b/containers/dapr-dotnetcore-3.1/.devcontainer/Dockerfile @@ -13,7 +13,7 @@ ENV NVM_DIR=/home/vscode/.nvm ENV NVM_SYMLINK_CURRENT=true ENV PATH=${NVM_DIR}/current/bin:${PATH} -# [Optional] Install the Azure CLI +# [Optional] Install Azure CLI ARG INSTALL_AZURE_CLI="false" # Docker Compose version @@ -71,7 +71,7 @@ RUN apt-get update \ && apt-get -y install --no-install-recommends yarn; \ fi \ # - # [Optional] Install the Azure CLI + # [Optional] Install Azure CLI && if [ "$INSTALL_AZURE_CLI" = "true" ]; then \ echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ $(lsb_release -cs) main" > /etc/apt/sources.list.d/azure-cli.list \ && curl -sL https://packages.microsoft.com/keys/microsoft.asc | apt-key add - 2>/dev/null \ diff --git a/containers/dapr-dotnetcore-3.1/.devcontainer/devcontainer.json b/containers/dapr-dotnetcore-3.1/.devcontainer/devcontainer.json index 3dab9426..acbd8e7e 100644 --- a/containers/dapr-dotnetcore-3.1/.devcontainer/devcontainer.json +++ b/containers/dapr-dotnetcore-3.1/.devcontainer/devcontainer.json @@ -1,5 +1,5 @@ { - "name": "Dapr with C# (.NET Core 3.1)", + "name": "Dapr with C# (Community)", "dockerComposeFile": "docker-compose.yml", "service": "docker-from-docker", "workspaceFolder": "/workspace", diff --git a/containers/dapr-dotnetcore-3.1/README.md b/containers/dapr-dotnetcore-3.1/README.md index 60dc9e85..c34809d9 100644 --- a/containers/dapr-dotnetcore-3.1/README.md +++ b/containers/dapr-dotnetcore-3.1/README.md @@ -47,17 +47,21 @@ Only the integrated terminal is supported by the Remote - Containers extension. ### Installing Node.js or the Azure CLI -Given how frequently ASP.NET applications use Node.js for front end code, this container also includes Node.js. You can change the version of Node.js installed or disable its installation by updating these lines in `.devcontainer/Dockerfile`. +Given how frequently ASP.NET applications use Node.js for front end code, this container also includes Node.js. You can change the version of Node.js installed or disable its installation by updating these lines in `.devcontainer/docker-compose.yml`. -```Dockerfile -ARG INSTALL_NODE="true" -ARG NODE_VERSION="10" +```yaml +arg: + INSTALL_NODE: "true" + ARG NODE_VERSION: "10" ``` -If you would like to install the Azure CLI update this line in `.devcontainer/Dockerfile`: +If you would like to install the Azure CLI update this line in `.devcontainer/docker-compose.yml`: -```Dockerfile -ARG INSTALL_AZURE_CLI="true" +```yaml +arg: + INSTALL_AZURE_CLI: "true" + INSTALL_NODE: "true" + ARG NODE_VERSION: "10" ``` If you've already opened your folder in a container, rebuild the container using the **Remote-Containers: Rebuild Container** command from the Command Palette (F1) so the settings take effect. diff --git a/containers/dapr-typescript-node-12/.devcontainer/devcontainer.json b/containers/dapr-typescript-node-12/.devcontainer/devcontainer.json index c5c9551c..442d9cbb 100644 --- a/containers/dapr-typescript-node-12/.devcontainer/devcontainer.json +++ b/containers/dapr-typescript-node-12/.devcontainer/devcontainer.json @@ -1,5 +1,5 @@ { - "name": "Dapr with Node.js 12 & TypeScript", + "name": "Dapr with Node.js & TypeScript (Community)", "dockerComposeFile": "docker-compose.yml", "service": "docker-from-docker", "workspaceFolder": "/workspace", diff --git a/containers/debian/.devcontainer/base.Dockerfile b/containers/debian/.devcontainer/base.Dockerfile index 7206bf3d..5e7d73dc 100644 --- a/containers/debian/.devcontainer/base.Dockerfile +++ b/containers/debian/.devcontainer/base.Dockerfile @@ -12,7 +12,7 @@ ARG USER_GID=$USER_UID # Install needed packages and setup non-root user. Use a separate RUN statement to add your own dependencies. COPY library-scripts/*.sh /tmp/library-scripts/ RUN bash /tmp/library-scripts/common-debian.sh "${INSTALL_ZSH}" "${USERNAME}" "${USER_UID}" "${USER_GID}" "${UPGRADE_PACKAGES}" \ - && apt-get autoremove -y && apt-get clean -y && rm -rf /var/lib/apt/lists/* /tmp/library-scripts + && apt-get clean -y && rm -rf /var/lib/apt/lists/* /tmp/library-scripts # [Optional] Uncomment this section to install additional OS packages. # RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ diff --git a/containers/dotnetcore-fsharp/.devcontainer/Dockerfile b/containers/dotnetcore-fsharp/.devcontainer/Dockerfile index 6561492e..12160403 100644 --- a/containers/dotnetcore-fsharp/.devcontainer/Dockerfile +++ b/containers/dotnetcore-fsharp/.devcontainer/Dockerfile @@ -1,12 +1,12 @@ ARG VARIANT=3.1 FROM mcr.microsoft.com/vscode/devcontainers/dotnetcore:dev-${VARIANT} -# [Optional] Install a version of Node.js using nvm for front end dev +# [Option] Install Node.js ARG INSTALL_NODE="true" ARG NODE_VERSION="lts/*" RUN if [ "${INSTALL_NODE}" = "true" ]; then su vscode -c "source /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi -# [Optional] Install the Azure CLI - update the INSTALL_AZURE_CLI arg in devcontainer.json to enable. +# [Option] Install Azure CLI ARG INSTALL_AZURE_CLI="false" COPY library-scripts/azcli-debian.sh /tmp/library-scripts/ RUN if [ "$INSTALL_AZURE_CLI" = "true" ]; then bash /tmp/library-scripts/azcli-debian.sh; fi \ diff --git a/containers/dotnetcore-fsharp/README.md b/containers/dotnetcore-fsharp/README.md index 7d79bdb8..8eda67a9 100644 --- a/containers/dotnetcore-fsharp/README.md +++ b/containers/dotnetcore-fsharp/README.md @@ -100,7 +100,7 @@ Given how frequently ASP.NET applications use Node.js for front end code, this c ```json "args": { - "VARIANT": "3.1-bionic", + "VARIANT": "3.1", "INSTALL_NODE": "true", "NODE_VERSION": "10", } @@ -110,7 +110,7 @@ If you would like to install the Azure CLI update you can set the `INSTALL_AZURE ```Dockerfile "args": { - "VARIANT": "3.1-bionic", + "VARIANT": "3.1", "INSTALL_NODE": "true", "NODE_VERSION": "10", "INSTALL_AZURE_CLI": "true" diff --git a/containers/dotnetcore/.devcontainer/Dockerfile b/containers/dotnetcore/.devcontainer/Dockerfile index 9385c234..9b3e2d1a 100644 --- a/containers/dotnetcore/.devcontainer/Dockerfile +++ b/containers/dotnetcore/.devcontainer/Dockerfile @@ -1,12 +1,12 @@ ARG VARIANT=3.1 FROM mcr.microsoft.com/vscode/devcontainers/dotnetcore:${VARIANT} -# [Optional] Install a version of Node.js using nvm for front end dev +# [Option] Install Node.js ARG INSTALL_NODE="true" ARG NODE_VERSION="lts/*" RUN if [ "${INSTALL_NODE}" = "true" ]; then su vscode -c "source /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi -# [Optional] Install the Azure CLI - update the INSTALL_AZURE_CLI arg in devcontainer.json to enable. +# [Option] Install Azure CLI ARG INSTALL_AZURE_CLI="false" COPY library-scripts/azcli-debian.sh /tmp/library-scripts/ RUN if [ "$INSTALL_AZURE_CLI" = "true" ]; then bash /tmp/library-scripts/azcli-debian.sh; fi \ diff --git a/containers/dotnetcore/.devcontainer/base.Dockerfile b/containers/dotnetcore/.devcontainer/base.Dockerfile index cec50677..b62a1618 100644 --- a/containers/dotnetcore/.devcontainer/base.Dockerfile +++ b/containers/dotnetcore/.devcontainer/base.Dockerfile @@ -14,7 +14,7 @@ COPY library-scripts/common-debian.sh /tmp/library-scripts/ RUN bash /tmp/library-scripts/common-debian.sh "${INSTALL_ZSH}" "${USERNAME}" "${USER_UID}" "${USER_GID}" "${UPGRADE_PACKAGES}" \ && apt-get clean -y && rm -rf /var/lib/apt/lists/* /tmp/library-scripts -# [Optional] Install Node.js for use with web applications - update the INSTALL_NODE arg in devcontainer.json to enable. +# [Option] Install Node.js ARG INSTALL_NODE="true" ARG NODE_VERSION="none" ENV NVM_DIR=/usr/local/share/nvm @@ -24,7 +24,7 @@ COPY library-scripts/node-debian.sh /tmp/library-scripts/ RUN if [ "$INSTALL_NODE" = "true" ]; then bash /tmp/library-scripts/node-debian.sh "${NVM_DIR}" "${NODE_VERSION}" "${USERNAME}"; fi \ && apt-get clean -y && rm -rf /var/lib/apt/lists/* /tmp/library-scripts -# [Optional] Install the Azure CLI - update the INSTALL_AZURE_CLI arg in devcontainer.json to enable. +# [Option] Install Azure CLI ARG INSTALL_AZURE_CLI="false" COPY library-scripts/azcli-debian.sh /tmp/library-scripts/ RUN if [ "$INSTALL_AZURE_CLI" = "true" ]; then bash /tmp/library-scripts/azcli-debian.sh; fi \ diff --git a/containers/elm/.devcontainer/devcontainer.json b/containers/elm/.devcontainer/devcontainer.json index 41ea5ab5..b7c93d6d 100644 --- a/containers/elm/.devcontainer/devcontainer.json +++ b/containers/elm/.devcontainer/devcontainer.json @@ -1,5 +1,5 @@ { - "name": "Elm", + "name": "Elm (Community)", "dockerFile": "Dockerfile", // Set *default* container specific settings.json values on container create. diff --git a/containers/go/.devcontainer/Dockerfile b/containers/go/.devcontainer/Dockerfile index 0e251776..41b17fde 100644 --- a/containers/go/.devcontainer/Dockerfile +++ b/containers/go/.devcontainer/Dockerfile @@ -1,7 +1,7 @@ ARG VARIANT=1 FROM mcr.microsoft.com/vscode/devcontainers/go:${VARIANT} -# [Optional] Install a version of Node.js using nvm for front end dev +# [Option] Install Node.js ARG INSTALL_NODE="true" ARG NODE_VERSION="lts/*" RUN if [ "${INSTALL_NODE}" = "true" ]; then su vscode -c "source /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi diff --git a/containers/go/.devcontainer/base.Dockerfile b/containers/go/.devcontainer/base.Dockerfile index 054e2f84..687c3c29 100644 --- a/containers/go/.devcontainer/base.Dockerfile +++ b/containers/go/.devcontainer/base.Dockerfile @@ -56,7 +56,7 @@ RUN mkdir -p /tmp/gotools \ ENV GO111MODULE=auto -# [Optional] Install Node.js - update the INSTALL_NODE arg in devcontainer.json to enable. +# [Option] Install Node.js ARG INSTALL_NODE="true" ARG NODE_VERSION="none" ENV NVM_DIR=/usr/local/share/nvm diff --git a/containers/hugo/.devcontainer/devcontainer.json b/containers/hugo/.devcontainer/devcontainer.json index 340803bf..299c6458 100644 --- a/containers/hugo/.devcontainer/devcontainer.json +++ b/containers/hugo/.devcontainer/devcontainer.json @@ -1,5 +1,5 @@ { - "name": "Hugo", + "name": "Hugo (Community)", "build": { "dockerfile": "Dockerfile", "args": { diff --git a/containers/java-8/.devcontainer/Dockerfile b/containers/java-8/.devcontainer/Dockerfile index 4c0f8b0d..063a55cb 100644 --- a/containers/java-8/.devcontainer/Dockerfile +++ b/containers/java-8/.devcontainer/Dockerfile @@ -1,14 +1,15 @@ FROM mcr.microsoft.com/vscode/devcontainers/java:dev-8 -# [Optional] Install Maven or Gradle - version of "" installs latest +# [Option] Install Maven ARG INSTALL_MAVEN="false" ARG MAVEN_VERSION="" +# [Option] Install Gradle ARG INSTALL_GRADLE="false" ARG GRADLE_VERSION="" RUN if [ "${INSTALL_MAVEN}" = "true" ]; then su vscode -c "source /usr/local/sdkman/bin/sdkman-init.sh && sdk install maven \"${MAVEN_VERSION}\""; fi \ && if [ "${INSTALL_GRADLE}" = "true" ]; then su vscode -c "source /usr/local/sdkman/bin/sdkman-init.sh && sdk install gradle \"${GRADLE_VERSION}\""; fi -# [Optional] Install a version of Node.js using nvm for front end dev +# [Option] Install Node.js ARG INSTALL_NODE="true" ARG NODE_VERSION="lts/*" RUN if [ "${INSTALL_NODE}" = "true" ]; then su vscode -c "source /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi diff --git a/containers/java-8/README.md b/containers/java-8/README.md index 5353148d..be34af8a 100644 --- a/containers/java-8/README.md +++ b/containers/java-8/README.md @@ -1,4 +1,4 @@ -# Java +# Java 8 ## Summary diff --git a/containers/java/.devcontainer/Dockerfile b/containers/java/.devcontainer/Dockerfile index 1f6630e0..801969d9 100644 --- a/containers/java/.devcontainer/Dockerfile +++ b/containers/java/.devcontainer/Dockerfile @@ -1,15 +1,16 @@ ARG VARIANT=11 FROM mcr.microsoft.com/vscode/devcontainers/java:${VARIANT} -# [Optional] Install Maven or Gradle - version of "" installs latest +# [Option] Install Maven ARG INSTALL_MAVEN="false" ARG MAVEN_VERSION="" +# [Option] Install Gradle ARG INSTALL_GRADLE="false" ARG GRADLE_VERSION="" RUN if [ "${INSTALL_MAVEN}" = "true" ]; then su vscode -c "source /usr/local/sdkman/bin/sdkman-init.sh && sdk install maven \"${MAVEN_VERSION}\""; fi \ && if [ "${INSTALL_GRADLE}" = "true" ]; then su vscode -c "source /usr/local/sdkman/bin/sdkman-init.sh && sdk install gradle \"${GRADLE_VERSION}\""; fi -# [Optional] Install a version of Node.js using nvm for front end dev +# [Option] Install Node.js ARG INSTALL_NODE="true" ARG NODE_VERSION="lts/*" RUN if [ "${INSTALL_NODE}" = "true" ]; then su vscode -c "source /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi diff --git a/containers/java/.devcontainer/base.Dockerfile b/containers/java/.devcontainer/base.Dockerfile index 784f9ad8..8520f4ba 100644 --- a/containers/java/.devcontainer/base.Dockerfile +++ b/containers/java/.devcontainer/base.Dockerfile @@ -13,9 +13,10 @@ RUN bash /tmp/library-scripts/common-debian.sh "${INSTALL_ZSH}" "${USERNAME}" "$ && if [ ! -d "/docker-java-home" ]; then ln -s "${JAVA_HOME}" /docker-java-home; fi \ && apt-get clean -y && rm -rf /var/lib/apt/lists/* /tmp/library-scripts -# Install SDKMAN and optionally Maven and Gradle - version of "" installs latest +# [Option] Install Maven ARG INSTALL_MAVEN="false" ARG MAVEN_VERSION="" +# [Option] Install Gradle ARG INSTALL_GRADLE="false" ARG GRADLE_VERSION="" ENV SDKMAN_DIR="/usr/local/sdkman" @@ -26,7 +27,7 @@ RUN bash /tmp/library-scripts/java-debian.sh "none" "${SDKMAN_DIR}" "${USERNAME} && if [ "${INSTALL_GRADLE}" = "true" ]; then bash /tmp/library-scripts/gradle-debian.sh "${GRADLE_VERSION:-latest}" "${SDKMAN_DIR}" ${USERNAME} "true"; fi \ && apt-get clean -y && rm -rf /var/lib/apt/lists/* /tmp/library-scripts -# [Optional] Install Node.js for use with web applications - update the INSTALL_NODE arg in devcontainer.json to enable. +# [Option] Install Node.js ARG INSTALL_NODE="true" ARG NODE_VERSION="none" ENV NVM_DIR=/usr/local/share/nvm diff --git a/containers/jekyll/.devcontainer/Dockerfile b/containers/jekyll/.devcontainer/Dockerfile index f19b0c74..ae766c10 100644 --- a/containers/jekyll/.devcontainer/Dockerfile +++ b/containers/jekyll/.devcontainer/Dockerfile @@ -11,7 +11,7 @@ ENV LANG=en_US.UTF-8 \ # Install jekyll RUN gem install bundler jekyll -# Install a version of Node.js using nvm for dynamic front end content +# [Option] Install Node.js ARG NODE_VERSION="lts/*" RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1" diff --git a/containers/jekyll/.devcontainer/devcontainer.json b/containers/jekyll/.devcontainer/devcontainer.json index 8ee459a9..ba1924e7 100644 --- a/containers/jekyll/.devcontainer/devcontainer.json +++ b/containers/jekyll/.devcontainer/devcontainer.json @@ -1,5 +1,5 @@ { - "name": "Jekyll", + "name": "Jekyll (Community)", "build": { "dockerfile": "Dockerfile", "args": { diff --git a/containers/kubernetes-helm/README.md b/containers/kubernetes-helm/README.md index 77491287..b423a7d2 100644 --- a/containers/kubernetes-helm/README.md +++ b/containers/kubernetes-helm/README.md @@ -8,7 +8,7 @@ |----------|-------| | *Contributors* | The VS Code team and Phetsinorath William | | *Definition type* | Dockerfile | -| *Works in Codespaces* | Yes | +| *Works in Codespaces* | No | | *Container host OS support* | Linux, macOS, Windows | | *Languages, platforms* | Any | diff --git a/containers/perl/.devcontainer/devcontainer.json b/containers/perl/.devcontainer/devcontainer.json index 6736632d..7bad5e44 100644 --- a/containers/perl/.devcontainer/devcontainer.json +++ b/containers/perl/.devcontainer/devcontainer.json @@ -1,5 +1,5 @@ { - "name": "Perl", + "name": "Perl (Community)", "build": { "dockerfile": "Dockerfile", // Update VARIANT to pick a Perl version diff --git a/containers/php/.devcontainer/Dockerfile b/containers/php/.devcontainer/Dockerfile index 9562e175..ee45ba99 100644 --- a/containers/php/.devcontainer/Dockerfile +++ b/containers/php/.devcontainer/Dockerfile @@ -1,7 +1,7 @@ ARG VARIANT=7 FROM mcr.microsoft.com/vscode/devcontainers/php:${VARIANT} -# [Optional] Install a version of Node.js using nvm for front end dev +# [Option] Install Node.js ARG INSTALL_NODE="true" ARG NODE_VERSION="lts/*" RUN if [ "${INSTALL_NODE}" = "true" ]; then su vscode -c "source /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi diff --git a/containers/php/.devcontainer/base.Dockerfile b/containers/php/.devcontainer/base.Dockerfile index 3cfc5645..e3976b63 100644 --- a/containers/php/.devcontainer/base.Dockerfile +++ b/containers/php/.devcontainer/base.Dockerfile @@ -26,7 +26,7 @@ RUN curl -sSL https://getcomposer.org/installer | php \ && chmod +x composer.phar \ && mv composer.phar /usr/local/bin/composer -# [Optional] Install Node.js for use with web applications - update the INSTALL_NODE arg in devcontainer.json to enable. +# [Option] Install Node.js ARG INSTALL_NODE="true" ARG NODE_VERSION="none" ENV NVM_DIR=/usr/local/share/nvm diff --git a/containers/puppet/.devcontainer/devcontainer.json b/containers/puppet/.devcontainer/devcontainer.json index 7cb41c56..08b52402 100644 --- a/containers/puppet/.devcontainer/devcontainer.json +++ b/containers/puppet/.devcontainer/devcontainer.json @@ -1,5 +1,5 @@ { - "name": "Puppet Development Kit - Dockerfile", + "name": "Puppet Development Kit (Community)", "dockerFile": "Dockerfile", // Set *default* container specific settings.json values on container create. diff --git a/containers/python-3-device-simulator-express/.devcontainer/devcontainer.json b/containers/python-3-device-simulator-express/.devcontainer/devcontainer.json index cceea139..f18dd96f 100644 --- a/containers/python-3-device-simulator-express/.devcontainer/devcontainer.json +++ b/containers/python-3-device-simulator-express/.devcontainer/devcontainer.json @@ -1,5 +1,5 @@ { - "name": "Python 3 & Device Simulator Express", + "name": "Python 3 & Device Simulator Express (Community)", "build": { "dockerfile": "Dockerfile", "context": "..", diff --git a/containers/python-3/.devcontainer/Dockerfile b/containers/python-3/.devcontainer/Dockerfile index 830c86ca..734407d8 100644 --- a/containers/python-3/.devcontainer/Dockerfile +++ b/containers/python-3/.devcontainer/Dockerfile @@ -1,7 +1,7 @@ ARG VARIANT=3 FROM mcr.microsoft.com/vscode/devcontainers/python:${VARIANT} -# [Optional] Install a version of Node.js using nvm for front end dev +# [Option] Install Node.js ARG INSTALL_NODE="true" ARG NODE_VERSION="lts/*" RUN if [ "${INSTALL_NODE}" = "true" ]; then su vscode -c "source /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi diff --git a/containers/python-3/.devcontainer/base.Dockerfile b/containers/python-3/.devcontainer/base.Dockerfile index be66c7f3..0c38e0d9 100644 --- a/containers/python-3/.devcontainer/base.Dockerfile +++ b/containers/python-3/.devcontainer/base.Dockerfile @@ -40,7 +40,7 @@ RUN mkdir -p ${PIPX_BIN_DIR} \ && chown -R ${USER_UID}:${USER_GID} ${PIPX_HOME} \ && rm -rf /tmp/pip-tmp -# [Optional] Install Node.js for use with web applications - update the INSTALL_NODE arg in devcontainer.json to enable. +# [Option] Install Node.js ARG INSTALL_NODE="true" ARG NODE_VERSION="none" ENV NVM_DIR=/usr/local/share/nvm diff --git a/containers/r/.devcontainer/devcontainer.json b/containers/r/.devcontainer/devcontainer.json index 02137137..2c17b514 100644 --- a/containers/r/.devcontainer/devcontainer.json +++ b/containers/r/.devcontainer/devcontainer.json @@ -1,5 +1,5 @@ { - "name": "R", + "name": "R (Community)", "build": { "dockerfile": "Dockerfile", }, diff --git a/containers/reasonml/.devcontainer/devcontainer.json b/containers/reasonml/.devcontainer/devcontainer.json index 09100b58..57b4c6b8 100644 --- a/containers/reasonml/.devcontainer/devcontainer.json +++ b/containers/reasonml/.devcontainer/devcontainer.json @@ -1,5 +1,5 @@ { - "name": "ReasonML", + "name": "ReasonML (Community)", "dockerFile": "Dockerfile", // Set *default* container specific settings.json values on container create. diff --git a/containers/ruby-rails/.devcontainer/Dockerfile b/containers/ruby-rails/.devcontainer/Dockerfile index 32b643d8..8d49ece9 100644 --- a/containers/ruby-rails/.devcontainer/Dockerfile +++ b/containers/ruby-rails/.devcontainer/Dockerfile @@ -4,7 +4,7 @@ FROM mcr.microsoft.com/vscode/devcontainers/ruby:${VARIANT} # Install Rails RUN gem install rails webdrivers -# Install a version of Node.js using nvm for dynamic front end content +# [Option] Install Node.js ARG NODE_VERSION="lts/*" RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1" diff --git a/containers/ruby-sinatra/.devcontainer/Dockerfile b/containers/ruby-sinatra/.devcontainer/Dockerfile index faefc70e..61f37208 100644 --- a/containers/ruby-sinatra/.devcontainer/Dockerfile +++ b/containers/ruby-sinatra/.devcontainer/Dockerfile @@ -4,7 +4,7 @@ FROM mcr.microsoft.com/vscode/devcontainers/ruby:${VARIANT} # Install Sinatra RUN gem install sinatra sinatra-reloader thin data_mapper dm-sqlite-adapter -# Install a version of Node.js using nvm for dynamic front end content +# [Option] Install Node.js ARG NODE_VERSION="lts/*" RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1" diff --git a/containers/sfdx-project/.devcontainer/devcontainer.json b/containers/sfdx-project/.devcontainer/devcontainer.json index fea3b8ca..ae8c92e6 100644 --- a/containers/sfdx-project/.devcontainer/devcontainer.json +++ b/containers/sfdx-project/.devcontainer/devcontainer.json @@ -1,5 +1,5 @@ { - "name": "Salesforce Project", + "name": "Salesforce Project (Community)", "dockerFile": "Dockerfile", "extensions": [ "salesforce.salesforcedx-vscode", diff --git a/containers/swift/.devcontainer/Dockerfile b/containers/swift/.devcontainer/Dockerfile index 69a5ca52..ff20de89 100644 --- a/containers/swift/.devcontainer/Dockerfile +++ b/containers/swift/.devcontainer/Dockerfile @@ -22,7 +22,7 @@ RUN git clone https://github.com/vknabel/sourcekite \ && ln -s /usr/lib/libsourcekitdInProc.so /usr/lib/sourcekitdInProc \ && cd sourcekite && make install PREFIX=/usr/local -j2 -# [Optional] Install Node.js for use with web applications - update the INSTALL_NODE arg in devcontainer.json to enable. +# [Option] Install Node.js ARG INSTALL_NODE="false" ARG NODE_VERSION="lts/*" ENV NVM_DIR=/usr/local/share/nvm diff --git a/containers/vue/.devcontainer/devcontainer.json b/containers/vue/.devcontainer/devcontainer.json index fe9066bc..16f16c7d 100644 --- a/containers/vue/.devcontainer/devcontainer.json +++ b/containers/vue/.devcontainer/devcontainer.json @@ -1,10 +1,9 @@ { - "name": "Vue", + "name": "Vue (Community)", "build": { "dockerfile": "Dockerfile", "context": "..", - // Update 'VARIANT' to pick a Node version. Rebuild the container - // if it already exists to update. Available variants: 10, 12, 14 + // Update 'VARIANT' to pick a Node version: 10, 12, 14 "args": { "VARIANT": "14" } },