Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions ext/devcontainer/src/azd/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,26 @@

Installs the [Azure Developer CLI](https://github.com/Azure/azure-dev) along with needed dependencies.

## Example Usage
## Example Usage - Install latest `azd` version

```json
"features": {
"ghcr.io/azure/azure-dev/azd:1": {
"version": "stable"
}
"ghcr.io/azure/azure-dev/azd:latest": {}
Comment thread
hemarina marked this conversation as resolved.
}
```

## Example Usage - Install a specific `azd` version

Select a specific `azd` version [here](https://github.com/Azure/azure-dev/releases) and use it in `version`.

```json
"features": {
"ghcr.io/azure/azure-dev/azd:latest": {
"version": "<version-number>"
}
},
```

## Options

| Options Id | Description | Type | Default Value |
Expand Down
6 changes: 0 additions & 6 deletions templates/common/.devcontainer/Dockerfile/base/Dockerfile

This file was deleted.

2 changes: 0 additions & 2 deletions templates/common/.devcontainer/Dockerfile/func/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,5 @@ FROM --platform=amd64 mcr.microsoft.com/devcontainers/${IMAGE}
RUN curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microsoft.gpg \
&& mv microsoft.gpg /etc/apt/trusted.gpg.d/microsoft.gpg \
&& sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/debian/$(lsb_release -rs | cut -d'.' -f 1)/prod $(lsb_release -cs) main" > /etc/apt/sources.list.d/dotnetdev.list' \
&& apt-get update && apt-get install -y xdg-utils \
&& apt-get update && apt-get install -y azure-functions-core-tools-4 \
&& apt-get clean -y && rm -rf /var/lib/apt/lists/*
RUN curl -fsSL https://aka.ms/install-azd.sh | bash
2 changes: 0 additions & 2 deletions templates/common/.devcontainer/Dockerfile/java/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
ARG IMAGE=bullseye
FROM --platform=amd64 mcr.microsoft.com/devcontainers/${IMAGE}
RUN export DEBIAN_FRONTEND=noninteractive \
&& apt-get update && apt-get install -y xdg-utils \
&& apt-get update && apt-get install --yes --no-install-recommends postgresql-client \
&& apt-get clean -y && rm -rf /var/lib/apt/lists/*
RUN curl -fsSL https://aka.ms/install-azd.sh | bash
Original file line number Diff line number Diff line change
@@ -1,19 +1,15 @@
{
"name": "Azure Developer CLI",
"build": {
"dockerfile": "Dockerfile",
"args": {
"IMAGE": "javascript-node:16-bullseye"
}
},
"image": "mcr.microsoft.com/devcontainers/javascript-node:16-bullseye",
"features": {
"ghcr.io/devcontainers/features/docker-in-docker:2": {
},
"ghcr.io/devcontainers/features/kubectl-helm-minikube:1": {
"version": "latest",
"helm": "latest",
"minikube": "none"
}
},
"ghcr.io/azure/azure-dev/azd:latest": {}
},
"customizations": {
"vscode": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,11 @@
{
"name": "Azure Developer CLI",
"build": {
"dockerfile": "Dockerfile",
"args": {
// List of images: https://github.com/devcontainers/images/tree/main/src
"IMAGE": "python:3.10-bullseye"
}
},
"image": "mcr.microsoft.com/devcontainers/python:3.10-bullseye",
"features": {
// See https://containers.dev/features for list of features
"ghcr.io/devcontainers/features/docker-in-docker:2": {
}
},
"ghcr.io/azure/azure-dev/azd:latest": {}
},
"customizations": {
"vscode": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,14 @@
{
"name": "Azure Developer CLI",
"build": {
"dockerfile": "Dockerfile",
"args": {
"IMAGE": "dotnet:6.0-bullseye"
}
},
"image": "mcr.microsoft.com/devcontainers/dotnet:6.0-bullseye",
"features": {
"ghcr.io/devcontainers/features/docker-in-docker:2": {
},
"ghcr.io/devcontainers/features/node:1": {
"version": "16",
"nodeGypDependencies": false
}
},
"ghcr.io/azure/azure-dev/azd:latest": {}
},
"customizations": {
"vscode": {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{
"name": "Azure Developer CLI",
"build": {
"dockerfile": "Dockerfile",
"args": {
"IMAGE": "dotnet:6.0-bullseye"
}
},
"features": {
"ghcr.io/devcontainers/features/docker-in-docker:2": {
},
"ghcr.io/devcontainers/features/node:1": {
"version": "16",
"nodeGypDependencies": false
},
"ghcr.io/azure/azure-dev/azd:latest": {}
},
"customizations": {
"vscode": {
"extensions": [
"GitHub.vscode-github-actions",
"ms-azuretools.azure-dev",
"ms-azuretools.vscode-azurefunctions",
"ms-azuretools.vscode-bicep",
"ms-azuretools.vscode-docker",
"ms-dotnettools.csharp",
"ms-dotnettools.vscode-dotnet-runtime",
"ms-vscode.vscode-node-azure-pack"
]
}
},
"forwardPorts": [
3000,
3100
],
"postCreateCommand": "",
"remoteUser": "vscode",
"hostRequirements": {
"memory": "8gb"
}
}
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
{
"name": "Azure Developer CLI",
"build": {
"dockerfile": "Dockerfile",
"args": {
"IMAGE": "javascript-node:16-bullseye"
}
},
"image": "mcr.microsoft.com/devcontainers/javascript-node:16-bullseye",
"features": {
"ghcr.io/devcontainers/features/docker-in-docker:2": {
},
"ghcr.io/devcontainers/features/java:1": {}
"ghcr.io/devcontainers/features/java:1": {},
"ghcr.io/azure/azure-dev/azd:latest": {}
},
"customizations": {
"vscode": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
"ghcr.io/devcontainers/features/terraform:1": {
"version": "latest"
},
"ghcr.io/devcontainers/features/java:1": {}
"ghcr.io/devcontainers/features/java:1": {},
"ghcr.io/azure/azure-dev/azd:latest": {}
},
"customizations": {
"vscode": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
{
"name": "Azure Developer CLI",
"build": {
"dockerfile": "Dockerfile",
"args": {
"IMAGE": "javascript-node:16-bullseye"
}
},
"image": "mcr.microsoft.com/devcontainers/javascript-node:16-bullseye",
"features": {
"ghcr.io/devcontainers/features/docker-in-docker:2": {
}
},
"ghcr.io/azure/azure-dev/azd:latest": {}
},
"customizations": {
"vscode": {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"name": "Azure Developer CLI",
"build": {
"dockerfile": "Dockerfile",
"args": {
"IMAGE": "javascript-node:16-bullseye"
}
},
"features": {
"ghcr.io/devcontainers/features/docker-in-docker:2": {
},
"ghcr.io/azure/azure-dev/azd:latest": {}
},
"customizations": {
"vscode": {
"extensions": [
"dbaeumer.vscode-eslint",
"esbenp.prettier-vscode",
"GitHub.vscode-github-actions",
"ms-azuretools.azure-dev",
"ms-azuretools.vscode-azurefunctions",
"ms-azuretools.vscode-bicep",
"ms-azuretools.vscode-docker",
"ms-vscode.js-debug",
"ms-vscode.vscode-node-azure-pack"
]
}
},
"forwardPorts": [
3000,
3100
],
"postCreateCommand": "",
"remoteUser": "node",
"hostRequirements": {
"memory": "8gb"
}
}
Original file line number Diff line number Diff line change
@@ -1,19 +1,15 @@
{
"name": "Azure Developer CLI",
"build": {
"dockerfile": "Dockerfile",
"args": {
"IMAGE": "javascript-node:16-bullseye"
}
},
"image": "mcr.microsoft.com/devcontainers/javascript-node:16-bullseye",
"features": {
"ghcr.io/devcontainers/features/azure-cli:1": {
},
"ghcr.io/devcontainers/features/docker-in-docker:2": {
},
"ghcr.io/devcontainers/features/terraform:1": {
"version": "latest"
}
},
"ghcr.io/azure/azure-dev/azd:latest": {}
},
"customizations": {
"vscode": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,14 @@
{
"name": "Azure Developer CLI",
"build": {
"dockerfile": "Dockerfile",
"args": {
"IMAGE": "python:3.10-bullseye"
}
},
"image": "mcr.microsoft.com/devcontainers/python:3.10-bullseye",
"features": {
"ghcr.io/devcontainers/features/docker-in-docker:2": {
},
"ghcr.io/devcontainers/features/node:1": {
"version": "16",
"nodeGypDependencies": false
}
},
"ghcr.io/azure/azure-dev/azd:latest": {}
},
"customizations": {
"vscode": {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"name": "Azure Developer CLI",
"build": {
"dockerfile": "Dockerfile",
"args": {
"IMAGE": "python:3.10-bullseye"
}
},
"features": {
"ghcr.io/devcontainers/features/docker-in-docker:2": {
},
"ghcr.io/devcontainers/features/node:1": {
"version": "16",
"nodeGypDependencies": false
},
"ghcr.io/azure/azure-dev/azd:latest": {}
},
"customizations": {
"vscode": {
"extensions": [
"GitHub.vscode-github-actions",
"ms-azuretools.azure-dev",
"ms-azuretools.vscode-azurefunctions",
"ms-azuretools.vscode-bicep",
"ms-azuretools.vscode-docker",
"ms-python.python",
"ms-vscode.vscode-node-azure-pack"
]
}
},
"forwardPorts": [
3000,
3100
],
"postCreateCommand": "",
"remoteUser": "vscode",
"hostRequirements": {
"memory": "8gb"
}
}
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
{
"name": "Azure Developer CLI",
"build": {
"dockerfile": "Dockerfile",
"args": {
"IMAGE": "python:3.10-bullseye"
}
},
"image": "mcr.microsoft.com/devcontainers/python:3.10-bullseye",
"features": {
"ghcr.io/devcontainers/features/azure-cli:1": {
},
Expand All @@ -17,7 +12,8 @@
},
"ghcr.io/devcontainers/features/terraform:1": {
"version": "latest"
}
},
"ghcr.io/azure/azure-dev/azd:latest": {}
},
"customizations": {
"vscode": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
{
"name": "Azure Developer CLI",
"build": {
"dockerfile": "Dockerfile",
"args": {
// List of images: https://github.com/devcontainers/images/tree/main/src
"IMAGE": "python:3.10-bullseye"
}
},
"image": "mcr.microsoft.com/devcontainers/python:3.10-bullseye",
"features": {
// terraform and az (required for auth) are installed by default
// See https://containers.dev/features for list of features
Expand All @@ -16,7 +10,8 @@
},
"ghcr.io/devcontainers/features/terraform:1": {
"version": "latest"
}
},
"ghcr.io/azure/azure-dev/azd:latest": {}
},
"customizations": {
"vscode": {
Expand Down
4 changes: 0 additions & 4 deletions templates/starter/bicep/repo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,3 @@ repo:
- from: ../../common/.devcontainer/devcontainer.json/bicep-starter/devcontainer.json
to: ./.devcontainer/devcontainer.json

# .devcontainer common (Dockerfile)
- from: ../../common/.devcontainer/Dockerfile/base
to: ./.devcontainer

4 changes: 0 additions & 4 deletions templates/starter/terraform/repo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,3 @@ repo:
- from: ../../common/.devcontainer/devcontainer.json/terraform-starter/devcontainer.json
to: ./.devcontainer/devcontainer.json

# .devcontainer common (Dockerfile)
- from: ../../common/.devcontainer/Dockerfile/base
to: ./.devcontainer

Loading