diff --git a/templates/common/.devcontainer/Dockerfile/base/Dockerfile b/templates/common/.devcontainer/Dockerfile/base/Dockerfile index 2751d6c30f5..a2cf933cc6c 100644 --- a/templates/common/.devcontainer/Dockerfile/base/Dockerfile +++ b/templates/common/.devcontainer/Dockerfile/base/Dockerfile @@ -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/* diff --git a/templates/common/.devcontainer/Dockerfile/func/Dockerfile b/templates/common/.devcontainer/Dockerfile/func/Dockerfile index 2304c72e686..9c301651504 100644 --- a/templates/common/.devcontainer/Dockerfile/func/Dockerfile +++ b/templates/common/.devcontainer/Dockerfile/func/Dockerfile @@ -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' \ diff --git a/templates/common/.devcontainer/devcontainer.json/csharp/devcontainer.json b/templates/common/.devcontainer/devcontainer.json/csharp/devcontainer.json index 21beb0c77e0..0d917b7264c 100644 --- a/templates/common/.devcontainer/devcontainer.json/csharp/devcontainer.json +++ b/templates/common/.devcontainer/devcontainer.json/csharp/devcontainer.json @@ -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 diff --git a/templates/common/.devcontainer/devcontainer.json/java/devcontainer.json b/templates/common/.devcontainer/devcontainer.json/java/devcontainer.json index 6b0c122c86c..9bc4b46a0f3 100644 --- a/templates/common/.devcontainer/devcontainer.json/java/devcontainer.json +++ b/templates/common/.devcontainer/devcontainer.json/java/devcontainer.json @@ -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 diff --git a/templates/common/.devcontainer/devcontainer.json/nodejs/devcontainer.json b/templates/common/.devcontainer/devcontainer.json/nodejs/devcontainer.json index 2e2ecd80578..352dab16626 100644 --- a/templates/common/.devcontainer/devcontainer.json/nodejs/devcontainer.json +++ b/templates/common/.devcontainer/devcontainer.json/nodejs/devcontainer.json @@ -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": { @@ -35,7 +31,7 @@ 3100 ], "postCreateCommand": "", - "remoteUser": "vscode", + "remoteUser": "node", "hostRequirements": { "memory": "8gb" } diff --git a/templates/common/.devcontainer/devcontainer.json/nodejs/terraform/devcontainer.json b/templates/common/.devcontainer/devcontainer.json/nodejs/terraform/devcontainer.json index 06d506c851a..21026c2ab95 100644 --- a/templates/common/.devcontainer/devcontainer.json/nodejs/terraform/devcontainer.json +++ b/templates/common/.devcontainer/devcontainer.json/nodejs/terraform/devcontainer.json @@ -3,7 +3,7 @@ "build": { "dockerfile": "Dockerfile", "args": { - "VARIANT": "bullseye" + "IMAGE": "javascript-node:16" } }, "features": { @@ -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" } @@ -41,7 +37,7 @@ 3100 ], "postCreateCommand": "", - "remoteUser": "vscode", + "remoteUser": "node", "hostRequirements": { "memory": "8gb" } diff --git a/templates/common/.devcontainer/devcontainer.json/python/devcontainer.json b/templates/common/.devcontainer/devcontainer.json/python/devcontainer.json index cdeddc951c3..23b67f911d8 100644 --- a/templates/common/.devcontainer/devcontainer.json/python/devcontainer.json +++ b/templates/common/.devcontainer/devcontainer.json/python/devcontainer.json @@ -3,7 +3,7 @@ "build": { "dockerfile": "Dockerfile", "args": { - "VARIANT": "bullseye" + "IMAGE": "python:3.10" } }, "features": { @@ -13,9 +13,6 @@ "ghcr.io/devcontainers/features/node:1": { "version": "16", "nodeGypDependencies": false - }, - "ghcr.io/devcontainers/features/python:1": { - "version": "os-provided" } }, "customizations": { diff --git a/templates/common/.devcontainer/devcontainer.json/python/terraform/devcontainer.json b/templates/common/.devcontainer/devcontainer.json/python/terraform/devcontainer.json index 979c4d0c9cf..e551ab34967 100644 --- a/templates/common/.devcontainer/devcontainer.json/python/terraform/devcontainer.json +++ b/templates/common/.devcontainer/devcontainer.json/python/terraform/devcontainer.json @@ -3,7 +3,7 @@ "build": { "dockerfile": "Dockerfile", "args": { - "VARIANT": "bullseye" + "IMAGE": "python:3.10" } }, "features": { @@ -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" } diff --git a/templates/common/infra/terraform/core/host/appservice/appservicepython/appservicepython_variables.tf b/templates/common/infra/terraform/core/host/appservice/appservicepython/appservicepython_variables.tf index 98955ecd6df..185c47a2638 100644 --- a/templates/common/infra/terraform/core/host/appservice/appservicepython/appservicepython_variables.tf +++ b/templates/common/infra/terraform/core/host/appservice/appservicepython/appservicepython_variables.tf @@ -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" { diff --git a/templates/todo/api/python/Dockerfile b/templates/todo/api/python/Dockerfile index 1c6da016bce..138b4fd312a 100644 --- a/templates/todo/api/python/Dockerfile +++ b/templates/todo/api/python/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.9 +FROM python:3.10 WORKDIR /code EXPOSE 3100 COPY ./requirements.txt /code/requirements.txt diff --git a/templates/todo/api/python/pyproject.toml b/templates/todo/api/python/pyproject.toml index 2bdb41c4f34..9addf9a7e47 100644 --- a/templates/todo/api/python/pyproject.toml +++ b/templates/todo/api/python/pyproject.toml @@ -8,7 +8,7 @@ packages = [ ] [tool.poetry.dependencies] -python = "^3.8" +python = "^3.10" fastapi = "*" uvicorn = "*" beanie = "*" diff --git a/templates/todo/common/infra/bicep/app/api-appservice-python.bicep b/templates/todo/common/infra/bicep/app/api-appservice-python.bicep index c1aff59dd78..98dbc32bc72 100644 --- a/templates/todo/common/infra/bicep/app/api-appservice-python.bicep +++ b/templates/todo/common/infra/bicep/app/api-appservice-python.bicep @@ -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 } } diff --git a/templates/todo/projects/python-mongo-swa-func/README.md b/templates/todo/projects/python-mongo-swa-func/README.md index 146cbb2ba25..9536ac8e33e 100644 --- a/templates/todo/projects/python-mongo-swa-func/README.md +++ b/templates/todo/projects/python-mongo-swa-func/README.md @@ -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 diff --git a/templates/todo/projects/python-mongo/.repo/bicep/README.md b/templates/todo/projects/python-mongo/.repo/bicep/README.md index 45eca07c9f2..fe96676f526 100644 --- a/templates/todo/projects/python-mongo/.repo/bicep/README.md +++ b/templates/todo/projects/python-mongo/.repo/bicep/README.md @@ -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