Skip to content
This repository was archived by the owner on Nov 30, 2023. It is now read-only.

Commit a1a2f02

Browse files
committed
Merge branch 'master' of https://github.com/Microsoft/vscode-dev-containers into python-tweaks
2 parents 79d61fd + 0d50049 commit a1a2f02

File tree

39 files changed

+267
-93
lines changed

39 files changed

+267
-93
lines changed

container-templates/docker-compose/.devcontainer/Dockerfile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,13 @@
1111
# Debian and Ubuntu based images are supported. Alpine images are not yet supported.
1212
FROM debian:9
1313

14+
# Configure apt
15+
ENV DEBIAN_FRONTEND=noninteractive
16+
RUN apt-get update \
17+
&& apt-get -y install --no-install-recommends apt-utils 2>&1
18+
1419
# Install git, process tools, lsb-release (common in install instructions for CLIs)
15-
RUN apt-get update && apt-get -y install git procps lsb-release
20+
RUN apt-get -y install git procps lsb-release
1621

1722
# *****************************************************
1823
# * Add steps for installing needed dependencies here *
@@ -22,4 +27,5 @@ RUN apt-get update && apt-get -y install git procps lsb-release
2227
RUN apt-get autoremove -y \
2328
&& apt-get clean -y \
2429
&& rm -rf /var/lib/apt/lists/*
30+
ENV DEBIAN_FRONTEND=dialog
2531

container-templates/dockerfile/.devcontainer/Dockerfile

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,13 @@
66
# Debian and Ubuntu based images are supported. Alpine images are not yet supported.
77
FROM debian:9
88

9+
# Configure apt
10+
ENV DEBIAN_FRONTEND=noninteractive
11+
RUN apt-get update \
12+
&& apt-get -y install --no-install-recommends apt-utils 2>&1
13+
914
# Install git, process tools, lsb-release (common in install instructions for CLIs)
10-
RUN apt-get update && apt-get -y install git procps lsb-release
15+
RUN apt-get -y install git procps lsb-release
1116

1217
# *****************************************************
1318
# * Add steps for installing needed dependencies here *
@@ -17,4 +22,4 @@ RUN apt-get update && apt-get -y install git procps lsb-release
1722
RUN apt-get autoremove -y \
1823
&& apt-get clean -y \
1924
&& rm -rf /var/lib/apt/lists/*
20-
25+
ENV DEBIAN_FRONTEND=dialog

containers/azure-cli/.devcontainer/Dockerfile

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,25 @@
55

66
FROM debian:9
77

8+
# Configure apt
9+
ENV DEBIAN_FRONTEND=noninteractive
10+
RUN apt-get update \
11+
&& apt-get -y install --no-install-recommends apt-utils 2>&1
12+
813
# Install git, process tools
9-
RUN apt-get update && apt-get -y install git procps
14+
RUN apt-get -y install git procps
1015

1116
# Install the Azure CLI
1217
RUN apt-get install -y apt-transport-https curl gnupg2 lsb-release \
1318
&& echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ $(lsb_release -cs) main" > /etc/apt/sources.list.d/azure-cli.list \
14-
&& curl -L https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \
19+
&& curl -sL https://packages.microsoft.com/keys/microsoft.asc | apt-key add - 2>/dev/null \
1520
&& apt-get update \
1621
&& apt-get install -y azure-cli
1722

1823
# Clean up
1924
RUN apt-get autoremove -y \
2025
&& apt-get clean -y \
2126
&& rm -rf /var/lib/apt/lists/*
27+
ENV DEBIAN_FRONTEND=dialog
28+
2229

containers/azure-cli/README.md

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,40 @@
1010
| *Definition type* | Dockerfile |
1111
| *Languages, platforms* | Any |
1212

13-
## Usage
13+
## Using this definition with an existing folder
1414

15-
[See here for information on using this definition with an existing project](../../README.md#using-a-definition).
15+
This definition requires an Azure subscription to use. You can create a [free account here](https://azure.microsoft.com/en-us/free/). Once you have an Azure account, follow these steps:
1616

17-
If you prefer, you can also just look through the contents of the `.devcontainer` folder to understand how to make changes to your own project.
17+
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.
1818

19-
If you want to try out the test project instead, open a cloned copy of this entire folder **Remote-Container: Open Folder in Container...** in VS Code and select a cloned copy of the entire folder and use the content in `test-project` to try things out.
19+
2. To use VS Code's copy of this definition:
20+
1. Start VS Code and open your project folder.
21+
2. Press <kbd>F1</kbd> select and **Remote-Containers: Create Container Configuration File...** from the command palette.
22+
3. Select the Azure CLI definition.
23+
24+
3. To use latest-and-greatest copy of this definition from the repository:
25+
1. Clone this repository.
26+
2. Copy the contents of `containers/azure-cli/.devcontainer` to the root of your project folder.
27+
3. Start VS Code and open your project folder.
28+
29+
4. After following step 2 or 3, the contents of the `.devcontainer` folder in your project can be adapted to meet your needs.
30+
31+
5. Finally, press <kbd>F1</kbd> and run **Remote-Containers: Reopen Folder in Container** to start using the definition.
32+
33+
## Testing the definition
34+
35+
This definition includes some test code that will help you verify it is working as expected on your system. Follow these steps:
36+
37+
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.
38+
2. Clone this repository.
39+
3. Start VS Code, press <kbd>F1</kbd>, and select **Remote-Containers: Open Folder in Container...**
40+
4. Select the `containers/azure-cli` folder.
41+
5. After the folder has opened in the container, press <kbd>ctrl</kbd>+<kbd>shift</kbd>+<kbd>`</kbd> to start a new terminal.
42+
6. Open `test-project/scripting.azcli`
43+
7. Right click on one of the lines and select Run Line in Terminal
2044

2145
## License
2246

2347
Copyright (c) Microsoft Corporation. All rights reserved.
2448

25-
Licensed under the MIT License. See [LICENSE](../../LICENSE).
49+
Licensed under the MIT License. See [LICENSE](https://github.com/Microsoft/vscode-dev-containers/blob/master/LICENSE).

containers/azure-functions-dotnetcore-2.1/README.md

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,31 @@
88
|----------|-------|
99
| *Contributors* | The VS Code Team |
1010
| *Definition type* | Dockerfile |
11-
| *Languages, platforms* | Azure Functions, Node.js, JavaScript |
11+
| *Languages, platforms* | Azure Functions, .NET Core, C# |
1212

13-
## Usage
13+
## Using this definition with an existing folder
1414

15-
[See here for information on using this definition with an existing project](../../README.md#using-a-definition).
15+
This definition requires an Azure subscription to use. You can create a [free account here](https://azure.microsoft.com/en-us/free/serverless/) and learn more about using [Azure Functions with VS Code here](https://docs.microsoft.com/en-us/azure/azure-functions/functions-create-first-function-vs-code). Once you have an Azure account, follow these steps:
1616

17-
If you prefer, you can also just look through the contents of the `.devcontainer` folder to understand how to make changes to your own project.
17+
18+
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.
19+
20+
2. To use VS Code's copy of this definition:
21+
1. Start VS Code and open your project folder.
22+
2. Press <kbd>F1</kbd> select and **Remote-Containers: Create Container Configuration File...** from the command palette.
23+
3. Select the Azure Functions & C# (.NET Core 2.1) definition.
24+
25+
3. To use latest-and-greatest copy of this definition from the repository:
26+
1. Clone this repository.
27+
2. Copy the contents of `containers/azure-functions-dotnetcore-2.1/.devcontainer` to the root of your project folder.
28+
3. Start VS Code and open your project folder.
29+
30+
4. After following step 2 or 3, the contents of the `.devcontainer` folder in your project can be adapted to meet your needs.
31+
32+
5. Finally, press <kbd>F1</kbd> and run **Remote-Containers: Reopen Folder in Container** to start using the definition.
1833

1934
## License
2035

2136
Copyright (c) Microsoft Corporation. All rights reserved.
2237

23-
Licensed under the MIT License. See [LICENSE](../../LICENSE).
38+
Licensed under the MIT License. See [LICENSE](https://github.com/Microsoft/vscode-dev-containers/blob/master/LICENSE).

containers/azure-functions-dotnetcore-latest/README.md

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,36 @@
22

33
## Summary
44

5-
*Develop Azure Functions in C#. Includes NET Core (latest), the Azure Functions SDK, and related extensions and dependencies.*
5+
*Develop Azure Functions in C#. Includes NET Core (Latest), the Azure Functions SDK, and related extensions and dependencies.*
66

77
| Metadata | Value |
88
|----------|-------|
99
| *Contributors* | The VS Code Team |
1010
| *Definition type* | Dockerfile |
11-
| *Languages, platforms* | Azure Functions, Node.js, JavaScript |
11+
| *Languages, platforms* | Azure Functions, .NET Core, C# |
1212

13-
## Usage
13+
## Using this definition with an existing folder
1414

15-
[See here for information on using this definition with an existing project](../../README.md#using-a-definition).
15+
This definition requires an Azure subscription to use. You can create a [free account here](https://azure.microsoft.com/en-us/free/serverless/) and learn more about using [Azure Functions with VS Code here](https://docs.microsoft.com/en-us/azure/azure-functions/functions-create-first-function-vs-code). Once you have an Azure account, follow these steps:
1616

17-
If you prefer, you can also just look through the contents of the `.devcontainer` folder to understand how to make changes to your own project.
17+
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.
18+
19+
2. To use VS Code's copy of this definition:
20+
1. Start VS Code and open your project folder.
21+
2. Press <kbd>F1</kbd> select and **Remote-Containers: Create Container Configuration File...** from the command palette.
22+
3. Select the Azure Functions & C# (.NET Core Latest) definition.
23+
24+
3. To use latest-and-greatest copy of this definition from the repository:
25+
1. Clone this repository.
26+
2. Copy the contents of `containers/azure-functions-dotnetcore-latest/.devcontainer` to the root of your project folder.
27+
3. Start VS Code and open your project folder.
28+
29+
4. After following step 2 or 3, the contents of the `.devcontainer` folder in your project can be adapted to meet your needs.
30+
31+
5. Finally, press <kbd>F1</kbd> and run **Remote-Containers: Reopen Folder in Container** to start using the definition.
1832

1933
## License
2034

2135
Copyright (c) Microsoft Corporation. All rights reserved.
2236

23-
Licensed under the MIT License. See [LICENSE](../../LICENSE).
37+
Licensed under the MIT License. See [LICENSE](https://github.com/Microsoft/vscode-dev-containers/blob/master/LICENSE).

containers/azure-functions-node-8/README.md

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,28 @@
1010
| *Definition type* | Dockerfile |
1111
| *Languages, platforms* | Azure Functions, Node.js, JavaScript |
1212

13-
## Usage
13+
## Using this definition with an existing folder
1414

15-
[See here for information on using this definition with an existing project](../../README.md#using-a-definition).
15+
This definition requires an Azure subscription to use. You can create a [free account here](https://azure.microsoft.com/en-us/free/serverless/) and learn more about using [Azure Functions with VS Code here](https://docs.microsoft.com/en-us/azure/azure-functions/functions-create-first-function-vs-code). Once you have an Azure account, follow these steps:
1616

17-
If you prefer, you can also just look through the contents of the `.devcontainer` folder to understand how to make changes to your own project.
17+
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.
18+
19+
2. To use VS Code's copy of this definition:
20+
1. Start VS Code and open your project folder.
21+
2. Press <kbd>F1</kbd> select and **Remote-Containers: Create Container Configuration File...** from the command palette.
22+
3. Select the Azure Functions & Node.js 8 definition.
23+
24+
3. To use latest-and-greatest copy of this definition from the repository:
25+
1. Clone this repository.
26+
2. Copy the contents of `containers/azure-functions-node-8/.devcontainer` to the root of your project folder.
27+
3. Start VS Code and open your project folder.
28+
29+
4. After following step 2 or 3, the contents of the `.devcontainer` folder in your project can be adapted to meet your needs.
30+
31+
5. Finally, press <kbd>F1</kbd> and run **Remote-Containers: Reopen Folder in Container** to start using the definition.
1832

1933
## License
2034

2135
Copyright (c) Microsoft Corporation. All rights reserved.
2236

23-
Licensed under the MIT License. See [LICENSE](../../LICENSE).
37+
Licensed under the MIT License. See [LICENSE](https://github.com/Microsoft/vscode-dev-containers/blob/master/LICENSE).

containers/azure-functions-node-lts/README.md

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,28 @@
1010
| *Definition type* | Dockerfile |
1111
| *Languages, platforms* | Azure Functions, Node.js, JavaScript |
1212

13-
## Usage
13+
## Using this definition with an existing folder
1414

15-
[See here for information on using this definition with an existing project](../../README.md#using-a-definition).
15+
This definition requires an Azure subscription to use. You can create a [free account here](https://azure.microsoft.com/en-us/free/serverless/) and learn more about using [Azure Functions with VS Code here](https://docs.microsoft.com/en-us/azure/azure-functions/functions-create-first-function-vs-code). Once you have an Azure account, follow these steps:
1616

17-
If you prefer, you can also just look through the contents of the `.devcontainer` folder to understand how to make changes to your own project.
17+
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.
18+
19+
2. To use VS Code's copy of this definition:
20+
1. Start VS Code and open your project folder.
21+
2. Press <kbd>F1</kbd> select and **Remote-Containers: Create Container Configuration File...** from the command palette.
22+
3. Select the Azure Functions & Node.js (latest LTS) definition.
23+
24+
3. To use latest-and-greatest copy of this definition from the repository:
25+
1. Clone this repository.
26+
2. Copy the contents of `containers/azure-functions-node-lts/.devcontainer` to the root of your project folder.
27+
3. Start VS Code and open your project folder.
28+
29+
4. After following step 2 or 3, the contents of the `.devcontainer` folder in your project can be adapted to meet your needs.
30+
31+
5. Finally, press <kbd>F1</kbd> and run **Remote-Containers: Reopen Folder in Container** to start using the definition.
1832

1933
## License
2034

2135
Copyright (c) Microsoft Corporation. All rights reserved.
2236

23-
Licensed under the MIT License. See [LICENSE](../../LICENSE).
37+
Licensed under the MIT License. See [LICENSE](https://github.com/Microsoft/vscode-dev-containers/blob/master/LICENSE).

containers/azure-hdinsight-python-3/README.md

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,28 @@
1010
| *Definition type* | Dockerfile |
1111
| *Languages, platforms* | Azure HDInsight, Python |
1212

13-
## Usage
13+
## Using this definition with an existing folder
1414

15-
[See here for information on using this definition with an existing project](../../README.md#using-a-definition).
15+
This definition requires an Azure subscription to use. You can create a [free trial account here](https://azure.microsoft.com/en-us/free/) and learn more about using [Azure HDInsight with VS Code here](https://docs.microsoft.com/en-us/azure/hdinsight/hdinsight-for-vscode#open-hdinsight-work-folder). Once you have an Azure account, follow these steps:
1616

17-
If you prefer, you can also just look through the contents of the `.devcontainer` folder to understand how to make changes to your own project.
17+
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.
18+
19+
2. To use VS Code's copy of this definition:
20+
1. Start VS Code and open your project folder.
21+
2. Press <kbd>F1</kbd> select and **Remote-Containers: Create Container Configuration File...** from the command palette.
22+
3. Select the Azure HDInsight definition.
23+
24+
3. To use latest-and-greatest copy of this definition from the repository:
25+
1. Clone this repository.
26+
2. Copy the contents of `containers/azure-hdinsight-python-3/.devcontainer` to the root of your project folder.
27+
3. Start VS Code and open your project folder.
28+
29+
4. After following step 2 or 3, the contents of the `.devcontainer` folder in your project can be adapted to meet your needs.
30+
31+
5. Finally, press <kbd>F1</kbd> and run **Remote-Containers: Reopen Folder in Container** to start using the definition.
1832

1933
## License
2034

2135
Copyright (c) Microsoft Corporation. All rights reserved.
2236

23-
Licensed under the MIT License. See [LICENSE](../../LICENSE).
37+
Licensed under the MIT License. See [LICENSE](https://github.com/Microsoft/vscode-dev-containers/blob/master/LICENSE).

containers/azure-machine-learning-python-3/README.md

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,28 @@
1010
| *Definition type* | Dockerfile |
1111
| *Languages, platforms* | Azure Machine Learning, Python |
1212

13-
## Usage
13+
## Using this definition with an existing folder
1414

15-
[See here for information on using this definition with an existing project](../../README.md#using-a-definition).
15+
This definition requires an Azure subscription to use. You can create a [free account here](https://account.azure.com/signup?offer=ms-azr-0044p&appId=102&ref=azureplat-generic&redirectURL=https%3a%2f%2fazure.microsoft.com%2fen-us%2fget-started%2fwelcome-to-azure%2f&l=en-us&correlationId=15FE63BE1C4960F42D1B6EFB18496296) and learn more about using [Azure Machine Learning with VS Code here](https://docs.microsoft.com/en-us/azure/machine-learning/service/how-to-vscode-tools#get-started-with-azure-machine-learning). Once you have an Azure account, follow these steps:
1616

17-
If you prefer, you can also just look through the contents of the `.devcontainer` folder to understand how to make changes to your own project.
17+
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.
18+
19+
2. To use VS Code's copy of this definition:
20+
1. Start VS Code and open your project folder.
21+
2. Press <kbd>F1</kbd> select and **Remote-Containers: Create Container Configuration File...** from the command palette.
22+
3. Select the Azure Machine Learning definition.
23+
24+
3. To use latest-and-greatest copy of this definition from the repository:
25+
1. Clone this repository.
26+
2. Copy the contents of `containers/azure-machine-learning-python-3/.devcontainer` to the root of your project folder.
27+
3. Start VS Code and open your project folder.
28+
29+
4. After following step 2 or 3, the contents of the `.devcontainer` folder in your project can be adapted to meet your needs.
30+
31+
5. Finally, press <kbd>F1</kbd> and run **Remote-Containers: Reopen Folder in Container** to start using the definition.
1832

1933
## License
2034

2135
Copyright (c) Microsoft Corporation. All rights reserved.
2236

23-
Licensed under the MIT License. See [LICENSE](../../LICENSE).
37+
Licensed under the MIT License. See [LICENSE](https://github.com/Microsoft/vscode-dev-containers/blob/master/LICENSE).

0 commit comments

Comments
 (0)