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
4 changes: 2 additions & 2 deletions templates/common/.devcontainer/Dockerfile/base/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG VARIANT=bullseye
FROM --platform=amd64 mcr.microsoft.com/vscode/devcontainers/base:0-${VARIANT}
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 clean -y && rm -rf /var/lib/apt/lists/*
Expand Down
4 changes: 2 additions & 2 deletions templates/common/.devcontainer/Dockerfile/func/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG VARIANT=bullseye
FROM --platform=amd64 mcr.microsoft.com/vscode/devcontainers/base:0-${VARIANT}
ARG IMAGE=bullseye
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' \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,13 @@
"build": {
"dockerfile": "Dockerfile",
"args": {
"VARIANT": "bullseye"
"IMAGE": "dotnet:6.0"
}
},
"features": {
"ghcr.io/devcontainers/features/docker-from-docker:1": {
"version": "20.10"
},
"ghcr.io/devcontainers/features/dotnet:1": {
"version": "6.0"
},
"ghcr.io/devcontainers/features/node:1": {
"version": "16",
"nodeGypDependencies": false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,13 @@
"build": {
"dockerfile": "Dockerfile",
"args": {
"VARIANT": "bullseye"
"IMAGE": "java:17"
}
},
"features": {
"ghcr.io/devcontainers/features/docker-from-docker:1": {
"version": "20.10"
},
"ghcr.io/devcontainers/features/java:1": {
"version": "17.0"
},
"ghcr.io/devcontainers/features/node:1": {
"version": "16",
"nodeGypDependencies": false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,12 @@
"build": {
"dockerfile": "Dockerfile",
"args": {
"VARIANT": "bullseye"
"IMAGE": "javascript-node:16"
}
},
"features": {
"ghcr.io/devcontainers/features/docker-from-docker:1": {
"version": "20.10"
},
"ghcr.io/devcontainers/features/node:1": {
"version": "16",
"nodeGypDependencies": false
}
},
"customizations": {
Expand All @@ -35,7 +31,7 @@
3100
],
"postCreateCommand": "",
"remoteUser": "vscode",
"remoteUser": "node",
"hostRequirements": {
"memory": "8gb"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"build": {
"dockerfile": "Dockerfile",
"args": {
"VARIANT": "bullseye"
"IMAGE": "javascript-node:16"
}
},
"features": {
Expand All @@ -13,10 +13,6 @@
"ghcr.io/devcontainers/features/docker-from-docker:1": {
"version": "20.10"
},
"ghcr.io/devcontainers/features/node:1": {
"version": "16",
"nodeGypDependencies": false
},
"ghcr.io/devcontainers/features/terraform:1": {
"version": "latest"
}
Expand All @@ -41,7 +37,7 @@
3100
],
"postCreateCommand": "",
"remoteUser": "vscode",
"remoteUser": "node",
"hostRequirements": {
"memory": "8gb"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"build": {
"dockerfile": "Dockerfile",
"args": {
"VARIANT": "bullseye"
"IMAGE": "python:3.10"
}
},
"features": {
Expand All @@ -13,9 +13,6 @@
"ghcr.io/devcontainers/features/node:1": {
"version": "16",
"nodeGypDependencies": false
},
"ghcr.io/devcontainers/features/python:1": {
"version": "os-provided"
}
},
"customizations": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"build": {
"dockerfile": "Dockerfile",
"args": {
"VARIANT": "bullseye"
"IMAGE": "python:3.10"
}
},
"features": {
Expand All @@ -17,9 +17,6 @@
"version": "16",
"nodeGypDependencies": false
},
"ghcr.io/devcontainers/features/python:1": {
"version": "os-provided"
},
"ghcr.io/devcontainers/features/terraform:1": {
"version": "latest"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ variable "resource_token" {
variable "python_version" {
description = "the application stack python version to set for the app service."
type = string
default = "3.8"
default = "3.10"
}

variable "health_check_path" {
Expand Down
2 changes: 1 addition & 1 deletion templates/todo/api/python/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.9
FROM python:3.10
WORKDIR /code
EXPOSE 3100
COPY ./requirements.txt /code/requirements.txt
Expand Down
2 changes: 1 addition & 1 deletion templates/todo/api/python/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ packages = [
]

[tool.poetry.dependencies]
python = "^3.8"
python = "^3.10"
fastapi = "*"
uvicorn = "*"
beanie = "*"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ module api '../../../../../common/infra/bicep/core/host/appservice.bicep' = {
appSettings: appSettings
keyVaultName: keyVaultName
runtimeName: 'python'
runtimeVersion: '3.8'
runtimeVersion: '3.10'
scmDoBuildDuringDeployment: true
}
}
Expand Down
4 changes: 2 additions & 2 deletions templates/todo/projects/python-mongo-swa-func/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ Let's jump in and get the ToDo app up and running in Azure. When you are finishe

### Prerequisites

The following prerequisites are required to use this application. Please ensure that you have them all installed locally.
The following prerequisites are required to use this application. Please ensure that you have them all installed locally, or open the project in Github Codespaces or [VS Code](https://code.visualstudio.com/) with the [Remote - Containers extension](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers) where they will be installed automatically.

- [Azure Developer CLI](https://aka.ms/azd-install)
- [Azure Functions Core Tools (4+)](https://docs.microsoft.com/azure/azure-functions/functions-run-local)
- [Python (3.8+)](https://www.python.org/downloads/) - for the API backend
- [Python (3.10+)](https://www.python.org/downloads/) - for the API backend

### Quickstart

Expand Down
4 changes: 2 additions & 2 deletions templates/todo/projects/python-mongo/.repo/bicep/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ Let's jump in and get the ToDo app up and running in Azure. When you are finishe

### Prerequisites

The following prerequisites are required to use this application. Please ensure that you have them all installed locally.
The following prerequisites are required to use this application. Please ensure that you have them all installed locally, or open the project in Github Codespaces or [VS Code](https://code.visualstudio.com/) with the [Remote - Containers extension](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers) where they will be installed automatically.

- [Azure Developer CLI](https://aka.ms/azd-install)
- [Python (3.8+)](https://www.python.org/downloads/) - for the API backend
- [Python (3.10+)](https://www.python.org/downloads/) - for the API backend
- [Node.js with npm (16.13.1+)](https://nodejs.org/) - for the Web frontend

### Quickstart
Expand Down