diff --git a/container-templates/docker-compose/.devcontainer/devcontainer.json b/container-templates/docker-compose/.devcontainer/devcontainer.json index ceb9c8d485..9de0720c1e 100644 --- a/container-templates/docker-compose/.devcontainer/devcontainer.json +++ b/container-templates/docker-compose/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "Dev Container Definition Template - Docker Compose", - "dockerComposeFile": ".devcontainer/docker-compose.yml", + "dockerComposeFile": "docker-compose.yml", "service": "your-service-name-here", "workspaceFolder": "/workspace", "shutdownAction": "stopCompose", diff --git a/container-templates/dockerfile/.devcontainer/devcontainer.json b/container-templates/dockerfile/.devcontainer/devcontainer.json index d208e26c1f..685e097a18 100644 --- a/container-templates/dockerfile/.devcontainer/devcontainer.json +++ b/container-templates/dockerfile/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "Dev Container Definition Template - Dockerfile", - "dockerFile": ".devcontainer/Dockerfile", + "dockerFile": "Dockerfile", "appPort": 3000, "extensions": [ "mutantdino.resourcemonitor" diff --git a/containers/azure-cli/.devcontainer/devcontainer.json b/containers/azure-cli/.devcontainer/devcontainer.json index c41847d0e8..059c5ad5a8 100644 --- a/containers/azure-cli/.devcontainer/devcontainer.json +++ b/containers/azure-cli/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "Azure CLI", - "dockerFile": ".devcontainer/Dockerfile", + "dockerFile": "Dockerfile", "extensions": [ "ms-vscode.azurecli" ] diff --git a/containers/azure-functions-node-8/.devcontainer/Dockerfile b/containers/azure-functions-node-8/.devcontainer/Dockerfile index f52e03e48a..1bb79a41c4 100644 --- a/containers/azure-functions-node-8/.devcontainer/Dockerfile +++ b/containers/azure-functions-node-8/.devcontainer/Dockerfile @@ -3,7 +3,7 @@ # Licensed under the MIT License. See LICENSE in the project root for license information. #----------------------------------------------------------------------------------------- -FROM microsoft/dotnet:2.1-sdk-stretch +FROM microsoft/dotnet:2.1-sdk-bionic # Install git, process tools RUN apt-get update && apt-get -y install git procps @@ -20,10 +20,8 @@ RUN apt-get install -y apt-transport-https \ && dpkg -i packages-microsoft-prod.deb \ && rm packages-microsoft-prod.deb \ && apt-get update \ - && apt-get download azure-functions-core-tools \ - && dpkg -i --force-depends azure-functions-core-tools*.deb \ - && rm azure-functions-core-tools*.deb - + && apt-get install -y azure-functions-core-tools + # Clean up RUN apt-get autoremove -y \ && apt-get clean -y \ diff --git a/containers/azure-functions-node-8/.devcontainer/devcontainer.json b/containers/azure-functions-node-8/.devcontainer/devcontainer.json index 6e002b6a2a..6d12b76dc0 100644 --- a/containers/azure-functions-node-8/.devcontainer/devcontainer.json +++ b/containers/azure-functions-node-8/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "Azure Functions & Node.js", - "dockerFile": ".devcontainer/Dockerfile", + "dockerFile": "Dockerfile", "appPort": 7071, "extensions": [ "ms-azuretools.vscode-azurefunctions" diff --git a/containers/azure-hdinsight-python-3/.devcontainer/devcontainer.json b/containers/azure-hdinsight-python-3/.devcontainer/devcontainer.json index 830b0649e0..be8343fa32 100644 --- a/containers/azure-hdinsight-python-3/.devcontainer/devcontainer.json +++ b/containers/azure-hdinsight-python-3/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "Azure HDInsight", - "dockerFile": ".devcontainer/Dockerfile", + "dockerFile": "Dockerfile", "extensions": [ "mshdinsight.azure-hdinsight" ] diff --git a/containers/azure-terraform/.devcontainer/devcontainer.json b/containers/azure-terraform/.devcontainer/devcontainer.json index 1d5eba3070..6f1959cd91 100644 --- a/containers/azure-terraform/.devcontainer/devcontainer.json +++ b/containers/azure-terraform/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "Azure Terraform", - "dockerFile": ".devcontainer/Dockerfile", + "dockerFile": "Dockerfile", "extensions": [ "mauve.terraform", "ms-azuretools.azureterraform" diff --git a/containers/cpp/.devcontainer/devcontainer.json b/containers/cpp/.devcontainer/devcontainer.json index e1ecac4629..f800a39768 100644 --- a/containers/cpp/.devcontainer/devcontainer.json +++ b/containers/cpp/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "C++", - "dockerFile": ".devcontainer/Dockerfile", + "dockerFile": "Dockerfile", "extensions": [ "ms-vscode.cpptools" ], diff --git a/containers/dart-web/.devcontainer/devcontainer.json b/containers/dart-web/.devcontainer/devcontainer.json index 1a860ca425..eef01a7d23 100644 --- a/containers/dart-web/.devcontainer/devcontainer.json +++ b/containers/dart-web/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "Dart", - "dockerFile": ".devcontainer/Dockerfile", + "dockerFile": "Dockerfile", "appPort": 8080, "extensions": [ "dart-code.dart-code", diff --git a/containers/docker-existing-docker-compose/.devcontainer/devcontainer.json b/containers/docker-existing-docker-compose/.devcontainer/devcontainer.json index 3533774265..a60df353d4 100644 --- a/containers/docker-existing-docker-compose/.devcontainer/devcontainer.json +++ b/containers/docker-existing-docker-compose/.devcontainer/devcontainer.json @@ -5,8 +5,8 @@ "// The .devcontainer/docker-compose.yml file contains any overrides you need/want to make.":"", "dockerComposeFile": [ - "docker-compose.yml", - ".devcontainer/docker-compose.yml" + "../docker-compose.yml", + "docker-compose.yml" ], "// The 'service' property is the name of the service for the container that VS Code should":"", diff --git a/containers/docker-existing-dockerfile/.devcontainer/devcontainer.json b/containers/docker-existing-dockerfile/.devcontainer/devcontainer.json index 068f5fb93f..7c133d641e 100644 --- a/containers/docker-existing-dockerfile/.devcontainer/devcontainer.json +++ b/containers/docker-existing-dockerfile/.devcontainer/devcontainer.json @@ -3,7 +3,7 @@ "// Update the 'dockerFile' property if you aren't using the standard 'Dockerfile' filename.":"", - "dockerFile": "Dockerfile", + "dockerFile": "../Dockerfile", "// Use the optional 'appPort' property to expose ports not already in your Dockerfile":"", diff --git a/containers/docker-in-docker-compose/.devcontainer/devcontainer.json b/containers/docker-in-docker-compose/.devcontainer/devcontainer.json index 2845514ed2..0a3f3626ca 100644 --- a/containers/docker-in-docker-compose/.devcontainer/devcontainer.json +++ b/containers/docker-in-docker-compose/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "Docker in Docker Compose", - "dockerComposeFile": ".devcontainer/docker-compose.yml", + "dockerComposeFile": "docker-compose.yml", "service": "docker-in-docker", "workspaceFolder": "/workspace", "shutdownAction": "stopCompose", diff --git a/containers/docker-in-docker/.devcontainer/devcontainer.json b/containers/docker-in-docker/.devcontainer/devcontainer.json index ff34834dec..1a0508d477 100644 --- a/containers/docker-in-docker/.devcontainer/devcontainer.json +++ b/containers/docker-in-docker/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "Docker in Docker", - "dockerFile": ".devcontainer/Dockerfile", + "dockerFile": "Dockerfile", "extensions": [ "peterjausovec.vscode-docker" ], diff --git a/containers/dotnetcore-2.2-fsharp/.devcontainer/devcontainer.json b/containers/dotnetcore-2.2-fsharp/.devcontainer/devcontainer.json index 7f99c8bd06..61783b01ea 100644 --- a/containers/dotnetcore-2.2-fsharp/.devcontainer/devcontainer.json +++ b/containers/dotnetcore-2.2-fsharp/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "F#", - "dockerFile": ".devcontainer/Dockerfile", + "dockerFile": "Dockerfile", "extensions": [ "Ionide.Ionide-fsharp", "ms-vscode.csharp" diff --git a/containers/dotnetcore-2.2/.devcontainer/devcontainer.json b/containers/dotnetcore-2.2/.devcontainer/devcontainer.json index 3ddf4b3e3d..99b34377f5 100644 --- a/containers/dotnetcore-2.2/.devcontainer/devcontainer.json +++ b/containers/dotnetcore-2.2/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": ".NET Core 2.2", - "dockerFile": ".devcontainer/Dockerfile", + "dockerFile": "Dockerfile", "appPort": 8090, "extensions": [ "ms-vscode.csharp" diff --git a/containers/go/.devcontainer/devcontainer.json b/containers/go/.devcontainer/devcontainer.json index 1aa16237cf..5565bc1de4 100644 --- a/containers/go/.devcontainer/devcontainer.json +++ b/containers/go/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "Go", - "dockerFile": ".devcontainer/Dockerfile", + "dockerFile": "Dockerfile", "extensions": [ "ms-vscode.go" ], diff --git a/containers/java-8-maven/.devcontainer/devcontainer.json b/containers/java-8-maven/.devcontainer/devcontainer.json index 6546d967cb..20ed9f5b24 100644 --- a/containers/java-8-maven/.devcontainer/devcontainer.json +++ b/containers/java-8-maven/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "Java", - "dockerFile": ".devcontainer/Dockerfile", + "dockerFile": "Dockerfile", "extensions": [ "vscjava.vscode-java-pack" ] diff --git a/containers/javascript-node-8/.devcontainer/devcontainer.json b/containers/javascript-node-8/.devcontainer/devcontainer.json index 488555447a..830092ed7d 100644 --- a/containers/javascript-node-8/.devcontainer/devcontainer.json +++ b/containers/javascript-node-8/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "Node.js 8", - "dockerFile": ".devcontainer/Dockerfile", + "dockerFile": "Dockerfile", "appPort": 3000, "extensions": [ "dbaeumer.vscode-eslint" diff --git a/containers/javascript-node-lts-mongo/.devcontainer/devcontainer.json b/containers/javascript-node-lts-mongo/.devcontainer/devcontainer.json index 1576eec67c..5234ed6ef3 100644 --- a/containers/javascript-node-lts-mongo/.devcontainer/devcontainer.json +++ b/containers/javascript-node-lts-mongo/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "Node.js & Mongo DB", - "dockerComposeFile": ".devcontainer/docker-compose.yml", + "dockerComposeFile": "docker-compose.yml", "service": "web", "workspaceFolder": "/workspace", "shutdownAction": "stopCompose", diff --git a/containers/javascript-node-lts/.devcontainer/devcontainer.json b/containers/javascript-node-lts/.devcontainer/devcontainer.json index ae1b1fd38b..29164c5cc5 100644 --- a/containers/javascript-node-lts/.devcontainer/devcontainer.json +++ b/containers/javascript-node-lts/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "Node.js (latest LTS)", - "dockerFile": ".devcontainer/Dockerfile", + "dockerFile": "Dockerfile", "appPort": 3000, "extensions": [ "dbaeumer.vscode-eslint" diff --git a/containers/kubernetes-helm/.devcontainer/devcontainer.json b/containers/kubernetes-helm/.devcontainer/devcontainer.json index 37c5936c74..60363def0d 100644 --- a/containers/kubernetes-helm/.devcontainer/devcontainer.json +++ b/containers/kubernetes-helm/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "Kubernetes", - "dockerFile": ".devcontainer/Dockerfile", + "dockerFile": "Dockerfile", "extensions": [ "peterjausovec.vscode-docker", "ms-kubernetes-tools.vscode-kubernetes-tools" diff --git a/containers/markdown/.devcontainer/devcontainer.json b/containers/markdown/.devcontainer/devcontainer.json index 31eef13df5..9494b279ad 100644 --- a/containers/markdown/.devcontainer/devcontainer.json +++ b/containers/markdown/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "Markdown Editing", - "dockerFile": ".devcontainer/Dockerfile", + "dockerFile": "Dockerfile", "extensions": [ "yzhang.markdown-all-in-one", "streetsidesoftware.code-spell-checker", diff --git a/containers/php-7/.devcontainer/devcontainer.json b/containers/php-7/.devcontainer/devcontainer.json index 701a04b0c8..55c060be43 100644 --- a/containers/php-7/.devcontainer/devcontainer.json +++ b/containers/php-7/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "PHP", - "dockerFile": ".devcontainer/Dockerfile", + "dockerFile": "Dockerfile", "extensions": [ "felixfbecker.php-debug", "felixfbecker.php-intellisense" diff --git a/containers/plantuml/.devcontainer/devcontainer.json b/containers/plantuml/.devcontainer/devcontainer.json index ab72c82adf..15e5aa6ecf 100644 --- a/containers/plantuml/.devcontainer/devcontainer.json +++ b/containers/plantuml/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "PlantUML", - "dockerFile": ".devcontainer/Dockerfile", + "dockerFile": "Dockerfile", "extensions": [ "jebbs.plantuml" ] diff --git a/containers/powershell/.devcontainer/devcontainer.json b/containers/powershell/.devcontainer/devcontainer.json index 35f62c953a..a5366ff63e 100644 --- a/containers/powershell/.devcontainer/devcontainer.json +++ b/containers/powershell/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "PowerShell", - "dockerFile": ".devcontainer/Dockerfile", + "dockerFile": "Dockerfile", "extensions": [ "ms-vscode.powershell" ] diff --git a/containers/python-2/.devcontainer/devcontainer.json b/containers/python-2/.devcontainer/devcontainer.json index 8160ff9bcf..001fc5c022 100644 --- a/containers/python-2/.devcontainer/devcontainer.json +++ b/containers/python-2/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "Python 2", - "dockerFile": ".devcontainer/Dockerfile", + "dockerFile": "Dockerfile", "extensions": [ "ms-python.python", "LittleFoxTeam.vscode-python-test-adapter" diff --git a/containers/python-3-django/.devcontainer/devcontainer.json b/containers/python-3-django/.devcontainer/devcontainer.json index e3b18e49d1..5f4dc7e5a8 100644 --- a/containers/python-3-django/.devcontainer/devcontainer.json +++ b/containers/python-3-django/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "Django", - "dockerFile": ".devcontainer/Dockerfile", + "dockerFile": "Dockerfile", "appPort": 8080, "extensions": [ "ms-python.python", diff --git a/containers/python-3-flask-redis/.devcontainer/devcontainer.json b/containers/python-3-flask-redis/.devcontainer/devcontainer.json index 15adbf6190..4ee5e18b59 100644 --- a/containers/python-3-flask-redis/.devcontainer/devcontainer.json +++ b/containers/python-3-flask-redis/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "Python & Redis", - "dockerComposeFile": ".devcontainer/docker-compose.yml", + "dockerComposeFile": "docker-compose.yml", "service": "web", "workspaceFolder": "/workspace", "shutdownAction": "stopCompose", diff --git a/containers/python-3-jupyter-pyspark/.devcontainer/devcontainer.json b/containers/python-3-jupyter-pyspark/.devcontainer/devcontainer.json index 00d2d782f1..287aa11944 100644 --- a/containers/python-3-jupyter-pyspark/.devcontainer/devcontainer.json +++ b/containers/python-3-jupyter-pyspark/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "Jupyter PySpark", - "dockerComposeFile": ".devcontainer/docker-compose.yml", + "dockerComposeFile": "docker-compose.yml", "service": "jupyter", "workspaceFolder": "/notebooks", "shutdownAction": "stopCompose", diff --git a/containers/python-3/.devcontainer/devcontainer.json b/containers/python-3/.devcontainer/devcontainer.json index bae43fa58d..ce4fb4bfcd 100644 --- a/containers/python-3/.devcontainer/devcontainer.json +++ b/containers/python-3/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "Python 3", - "dockerFile": ".devcontainer/Dockerfile", + "dockerFile": "Dockerfile", "extensions": [ "ms-python.python", "LittleFoxTeam.vscode-python-test-adapter" diff --git a/containers/ruby-2/.devcontainer/devcontainer.json b/containers/ruby-2/.devcontainer/devcontainer.json index 9a2c0b601f..a9f438f5d7 100644 --- a/containers/ruby-2/.devcontainer/devcontainer.json +++ b/containers/ruby-2/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "Ruby 2", - "dockerFile": ".devcontainer/Dockerfile", + "dockerFile": "Dockerfile", "extensions": [ "rebornix.Ruby" ] diff --git a/containers/rust/.devcontainer/devcontainer.json b/containers/rust/.devcontainer/devcontainer.json index 50731bc124..d81b2822eb 100644 --- a/containers/rust/.devcontainer/devcontainer.json +++ b/containers/rust/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "Rust", - "dockerFile": ".devcontainer/Dockerfile", + "dockerFile": "Dockerfile", "extensions": [ "rust-lang.rust", "bungcip.better-toml", diff --git a/containers/swift-4/.devcontainer/devcontainer.json b/containers/swift-4/.devcontainer/devcontainer.json index 828172702b..276c97d47a 100644 --- a/containers/swift-4/.devcontainer/devcontainer.json +++ b/containers/swift-4/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "Swift 4", - "dockerFile": ".devcontainer/Dockerfile", + "dockerFile": "Dockerfile", "extensions": [ "vknabel.vscode-swift-development-environment", "vadimcn.vscode-lldb" diff --git a/containers/typescript-node-8/.devcontainer/devcontainer.json b/containers/typescript-node-8/.devcontainer/devcontainer.json index 230a8a3886..62f1d09a32 100644 --- a/containers/typescript-node-8/.devcontainer/devcontainer.json +++ b/containers/typescript-node-8/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { - "name": "TypeScript", - "dockerFile": ".devcontainer/Dockerfile", + "name": "Node.js 8 & TypeScript", + "dockerFile": "Dockerfile", "appPort": 3000, "extensions": [ "ms-vscode.vscode-typescript-tslint-plugin" diff --git a/containers/typescript-node-lts/.devcontainer/devcontainer.json b/containers/typescript-node-lts/.devcontainer/devcontainer.json index 230a8a3886..dfe4545781 100644 --- a/containers/typescript-node-lts/.devcontainer/devcontainer.json +++ b/containers/typescript-node-lts/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { - "name": "TypeScript", - "dockerFile": ".devcontainer/Dockerfile", + "name": "Node.js (latest LTS) & TypeScript", + "dockerFile": "Dockerfile", "appPort": 3000, "extensions": [ "ms-vscode.vscode-typescript-tslint-plugin" diff --git a/containers/ubuntu-18.04-git/.devcontainer/devcontainer.json b/containers/ubuntu-18.04-git/.devcontainer/devcontainer.json index ef9356481e..09ef47f3ee 100644 --- a/containers/ubuntu-18.04-git/.devcontainer/devcontainer.json +++ b/containers/ubuntu-18.04-git/.devcontainer/devcontainer.json @@ -1,5 +1,5 @@ { "name": "Ubuntu 18.04 + Git", - "dockerFile": ".devcontainer/Dockerfile", + "dockerFile": "Dockerfile", "appPort": [] } \ No newline at end of file