From b6cbef9dc5d1fc92e77f0ed8f459d8ad19ac3256 Mon Sep 17 00:00:00 2001 From: Jonny Rylands Date: Wed, 11 Dec 2024 12:38:27 +0000 Subject: [PATCH] Bump porter + terraform version, template base image Debian versions, and template terraform and az cli versions (#4158) * Bump porter, mixin, azcli & terraform versions in templates * Bump porter, mixin, azcli & terraform versions in templates * Revert OHDSI debian version back to bullseye as sqlcmd not available for bookworm * Update CHANGELOG.md * Revert MLFlow base image version back to bullseye due to incompatibilities * Revert MLFlow Server image to bullseye due to incompatibilities * Update porter mixin versions to canary (until the tagged version numbers are added to their releases feed) * Update terraform version in Dev Container from 1.4.5 to 1.9.8 * Update porter az-mixin and terraform-mixin versions * Bump base workspace version --- .devcontainer/Dockerfile | 10 +++++----- CHANGELOG.md | 1 + templates/shared_services/admin-vm/Dockerfile.tmpl | 2 +- templates/shared_services/admin-vm/porter.yaml | 4 ++-- .../shared_services/airlock_notifier/Dockerfile.tmpl | 2 +- templates/shared_services/airlock_notifier/porter.yaml | 6 +++--- templates/shared_services/certs/Dockerfile.tmpl | 2 +- templates/shared_services/certs/porter.yaml | 4 ++-- templates/shared_services/cyclecloud/Dockerfile.tmpl | 2 +- templates/shared_services/cyclecloud/porter.yaml | 4 ++-- .../shared_services/databricks-auth/Dockerfile.tmpl | 2 +- templates/shared_services/databricks-auth/porter.yaml | 4 ++-- templates/shared_services/firewall/Dockerfile.tmpl | 2 +- templates/shared_services/firewall/porter.yaml | 4 ++-- templates/shared_services/gitea/Dockerfile.tmpl | 2 +- templates/shared_services/gitea/porter.yaml | 4 ++-- .../shared_services/sonatype-nexus-vm/Dockerfile.tmpl | 2 +- .../shared_services/sonatype-nexus-vm/porter.yaml | 4 ++-- templates/workspace_services/azureml/Dockerfile.tmpl | 2 +- templates/workspace_services/azureml/porter.yaml | 6 +++--- .../azureml/user_resources/aml_compute/Dockerfile.tmpl | 2 +- .../azureml/user_resources/aml_compute/porter.yaml | 4 ++-- templates/workspace_services/azuresql/Dockerfile.tmpl | 2 +- templates/workspace_services/azuresql/porter.yaml | 4 ++-- .../workspace_services/databricks/Dockerfile.tmpl | 2 +- templates/workspace_services/databricks/porter.yaml | 4 ++-- templates/workspace_services/gitea/Dockerfile.tmpl | 2 +- templates/workspace_services/gitea/porter.yaml | 2 +- templates/workspace_services/guacamole/Dockerfile.tmpl | 2 +- templates/workspace_services/guacamole/porter.yaml | 2 +- .../guacamole-azure-export-reviewvm/Dockerfile.tmpl | 2 +- .../guacamole-azure-export-reviewvm/porter.yaml | 4 ++-- .../guacamole-azure-import-reviewvm/Dockerfile.tmpl | 2 +- .../guacamole-azure-import-reviewvm/porter.yaml | 4 ++-- .../guacamole-azure-linuxvm/Dockerfile.tmpl | 2 +- .../user_resources/guacamole-azure-linuxvm/porter.yaml | 4 ++-- .../guacamole-azure-windowsvm/Dockerfile.tmpl | 2 +- .../guacamole-azure-windowsvm/porter.yaml | 2 +- .../workspace_services/health-services/Dockerfile.tmpl | 2 +- .../workspace_services/health-services/porter.yaml | 6 +++--- templates/workspace_services/mysql/Dockerfile.tmpl | 2 +- templates/workspace_services/mysql/porter.yaml | 4 ++-- templates/workspace_services/ohdsi/porter.yaml | 6 +++--- templates/workspace_services/openai/Dockerfile.tmpl | 2 +- templates/workspace_services/openai/porter.yaml | 4 ++-- .../workspaces/airlock-import-review/Dockerfile.tmpl | 2 +- templates/workspaces/airlock-import-review/porter.yaml | 6 +++--- templates/workspaces/base/Dockerfile.tmpl | 2 +- templates/workspaces/base/porter.yaml | 6 +++--- templates/workspaces/unrestricted/Dockerfile.tmpl | 2 +- templates/workspaces/unrestricted/porter.yaml | 6 +++--- 51 files changed, 84 insertions(+), 83 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 50fd380866..d4269875ce 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -24,7 +24,7 @@ ARG NODE_VERSION="lts/*" RUN su $USERNAME -c "umask 0002 && . /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1" # Install terraform -ARG TERRAFORM_VERSION="1.4.5" +ARG TERRAFORM_VERSION="1.9.8" COPY .devcontainer/scripts/terraform.sh /tmp/ RUN bash /tmp/terraform.sh "${TERRAFORM_VERSION}" /usr/bin @@ -49,10 +49,10 @@ RUN if [ "${INTERACTIVE}" = "true" ]; then \ && apt-get clean -y && rm -rf /var/lib/apt/lists/* ; fi ARG PORTER_HOME_V1=/home/$USERNAME/.porter/ -ARG PORTER_VERSION=v1.0.15 -ARG PORTER_TERRAFORM_MIXIN_VERSION=v1.0.2 -ARG PORTER_AZ_MIXIN_VERSION=v1.0.1 -ARG PORTER_AZURE_PLUGIN_VERSION=v1.2.0 +ARG PORTER_VERSION=v1.2.0 +ARG PORTER_TERRAFORM_MIXIN_VERSION=v1.0.5 +ARG PORTER_AZ_MIXIN_VERSION=v1.0.4 +ARG PORTER_AZURE_PLUGIN_VERSION=v1.2.3 COPY .devcontainer/scripts/porter-v1.sh /tmp/ RUN export PORTER_VERSION=${PORTER_VERSION} \ PORTER_TERRAFORM_MIXIN_VERSION=${PORTER_TERRAFORM_MIXIN_VERSION} \ diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d3288c92a..375d4787e8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,7 @@ ENHANCEMENTS: BUG FIXES: - Update KeyVault references in API to use the version so Terraform cascades the update ([#4112](https://github.com/microsoft/AzureTRE/pull/4112)) +- Template images are showing CVEs ([#4153](https://github.com/microsoft/AzureTRE/issues/4153) - Fix Dockerfile 'as' casting ([#4170](https://github.com/microsoft/AzureTRE/pull/4170)) COMPONENTS: diff --git a/templates/shared_services/admin-vm/Dockerfile.tmpl b/templates/shared_services/admin-vm/Dockerfile.tmpl index 29fcc34bfb..a8c0026343 100644 --- a/templates/shared_services/admin-vm/Dockerfile.tmpl +++ b/templates/shared_services/admin-vm/Dockerfile.tmpl @@ -1,5 +1,5 @@ # syntax=docker/dockerfile-upstream:1.4.0 -FROM --platform=linux/amd64 debian:bullseye-slim +FROM --platform=linux/amd64 debian:bookworm-slim # PORTER_INIT diff --git a/templates/shared_services/admin-vm/porter.yaml b/templates/shared_services/admin-vm/porter.yaml index 96d9e11867..4f9977a8b6 100644 --- a/templates/shared_services/admin-vm/porter.yaml +++ b/templates/shared_services/admin-vm/porter.yaml @@ -1,7 +1,7 @@ --- schemaVersion: 1.0.0 name: tre-shared-service-admin-vm -version: 0.4.7 +version: 0.4.8 description: "An admin vm shared service" dockerfile: Dockerfile.tmpl registry: azuretre @@ -47,7 +47,7 @@ parameters: mixins: - terraform: - clientVersion: 1.3.6 + clientVersion: 1.9.8 install: - terraform: diff --git a/templates/shared_services/airlock_notifier/Dockerfile.tmpl b/templates/shared_services/airlock_notifier/Dockerfile.tmpl index 213ef4d241..816a6fb388 100644 --- a/templates/shared_services/airlock_notifier/Dockerfile.tmpl +++ b/templates/shared_services/airlock_notifier/Dockerfile.tmpl @@ -1,5 +1,5 @@ # syntax=docker/dockerfile-upstream:1.4.0 -FROM --platform=linux/amd64 debian:bullseye-slim +FROM --platform=linux/amd64 debian:bookworm-slim # PORTER_INIT diff --git a/templates/shared_services/airlock_notifier/porter.yaml b/templates/shared_services/airlock_notifier/porter.yaml index bf9386ff09..09020d4de4 100644 --- a/templates/shared_services/airlock_notifier/porter.yaml +++ b/templates/shared_services/airlock_notifier/porter.yaml @@ -1,7 +1,7 @@ --- schemaVersion: 1.0.0 name: tre-shared-service-airlock-notifier -version: 1.0.6 +version: 1.0.7 description: "A shared service notifying on Airlock Operations" registry: azuretre dockerfile: Dockerfile.tmpl @@ -74,9 +74,9 @@ parameters: mixins: - exec - az: - clientVersion: 2.37.0 + clientVersion: 2.67.0 - terraform: - clientVersion: 1.4.6 + clientVersion: 1.9.8 install: - terraform: diff --git a/templates/shared_services/certs/Dockerfile.tmpl b/templates/shared_services/certs/Dockerfile.tmpl index 0f39713944..bfeac425d5 100644 --- a/templates/shared_services/certs/Dockerfile.tmpl +++ b/templates/shared_services/certs/Dockerfile.tmpl @@ -1,5 +1,5 @@ # syntax=docker/dockerfile-upstream:1.4.0 -FROM --platform=linux/amd64 python:3.8-slim-bullseye +FROM --platform=linux/amd64 python:3.13-slim-bookworm # PORTER_INIT diff --git a/templates/shared_services/certs/porter.yaml b/templates/shared_services/certs/porter.yaml index 2e3618caf9..6c4fee6453 100755 --- a/templates/shared_services/certs/porter.yaml +++ b/templates/shared_services/certs/porter.yaml @@ -55,9 +55,9 @@ parameters: mixins: - exec - terraform: - clientVersion: 1.3.6 + clientVersion: 1.9.8 - az: - clientVersion: 2.37.0 + clientVersion: 2.67.0 install: - terraform: diff --git a/templates/shared_services/cyclecloud/Dockerfile.tmpl b/templates/shared_services/cyclecloud/Dockerfile.tmpl index c584174140..abc241c3a1 100644 --- a/templates/shared_services/cyclecloud/Dockerfile.tmpl +++ b/templates/shared_services/cyclecloud/Dockerfile.tmpl @@ -1,5 +1,5 @@ # syntax=docker/dockerfile-upstream:1.4.0 -FROM --platform=linux/amd64 debian:bullseye-slim +FROM --platform=linux/amd64 debian:bookworm-slim # PORTER_INIT diff --git a/templates/shared_services/cyclecloud/porter.yaml b/templates/shared_services/cyclecloud/porter.yaml index 64ea04e3b7..f8a2ae9272 100644 --- a/templates/shared_services/cyclecloud/porter.yaml +++ b/templates/shared_services/cyclecloud/porter.yaml @@ -63,9 +63,9 @@ outputs: mixins: - exec - terraform: - clientVersion: 1.3.6 + clientVersion: 1.9.8 - az: - clientVersion: 2.37.0 + clientVersion: 2.67.0 install: - terraform: diff --git a/templates/shared_services/databricks-auth/Dockerfile.tmpl b/templates/shared_services/databricks-auth/Dockerfile.tmpl index c584174140..abc241c3a1 100644 --- a/templates/shared_services/databricks-auth/Dockerfile.tmpl +++ b/templates/shared_services/databricks-auth/Dockerfile.tmpl @@ -1,5 +1,5 @@ # syntax=docker/dockerfile-upstream:1.4.0 -FROM --platform=linux/amd64 debian:bullseye-slim +FROM --platform=linux/amd64 debian:bookworm-slim # PORTER_INIT diff --git a/templates/shared_services/databricks-auth/porter.yaml b/templates/shared_services/databricks-auth/porter.yaml index 5c96cebb14..d37fb67612 100644 --- a/templates/shared_services/databricks-auth/porter.yaml +++ b/templates/shared_services/databricks-auth/porter.yaml @@ -1,7 +1,7 @@ --- schemaVersion: 1.0.0 name: tre-shared-service-databricks-private-auth -version: 0.1.9 +version: 0.1.10 description: "An Azure TRE shared service for Azure Databricks authentication." registry: azuretre dockerfile: Dockerfile.tmpl @@ -52,7 +52,7 @@ outputs: mixins: - terraform: - clientVersion: 1.3.6 + clientVersion: 1.9.8 install: - terraform: diff --git a/templates/shared_services/firewall/Dockerfile.tmpl b/templates/shared_services/firewall/Dockerfile.tmpl index 4b5deb9d3a..4494f207a1 100644 --- a/templates/shared_services/firewall/Dockerfile.tmpl +++ b/templates/shared_services/firewall/Dockerfile.tmpl @@ -1,5 +1,5 @@ # syntax=docker/dockerfile-upstream:1.4.0 -FROM --platform=linux/amd64 debian:bullseye-slim +FROM --platform=linux/amd64 debian:bookworm-slim # PORTER_INIT diff --git a/templates/shared_services/firewall/porter.yaml b/templates/shared_services/firewall/porter.yaml index b4cbed7ed9..9324023a37 100644 --- a/templates/shared_services/firewall/porter.yaml +++ b/templates/shared_services/firewall/porter.yaml @@ -1,7 +1,7 @@ --- schemaVersion: 1.0.0 name: tre-shared-service-firewall -version: 1.2.6 +version: 1.2.7 description: "An Azure TRE Firewall shared service" dockerfile: Dockerfile.tmpl registry: azuretre @@ -57,7 +57,7 @@ parameters: mixins: - terraform: - clientVersion: 1.4.5 + clientVersion: 1.9.8 install: - terraform: diff --git a/templates/shared_services/gitea/Dockerfile.tmpl b/templates/shared_services/gitea/Dockerfile.tmpl index c584174140..abc241c3a1 100644 --- a/templates/shared_services/gitea/Dockerfile.tmpl +++ b/templates/shared_services/gitea/Dockerfile.tmpl @@ -1,5 +1,5 @@ # syntax=docker/dockerfile-upstream:1.4.0 -FROM --platform=linux/amd64 debian:bullseye-slim +FROM --platform=linux/amd64 debian:bookworm-slim # PORTER_INIT diff --git a/templates/shared_services/gitea/porter.yaml b/templates/shared_services/gitea/porter.yaml index 8cc0d66a76..2eb1a45c80 100644 --- a/templates/shared_services/gitea/porter.yaml +++ b/templates/shared_services/gitea/porter.yaml @@ -1,7 +1,7 @@ --- schemaVersion: 1.0.0 name: tre-shared-service-gitea -version: 1.1.0 +version: 1.1.1 description: "A Gitea shared service" dockerfile: Dockerfile.tmpl registry: azuretre @@ -57,7 +57,7 @@ parameters: mixins: - terraform: - clientVersion: 1.3.6 + clientVersion: 1.9.8 outputs: - name: gitea_allowed_fqdns_list diff --git a/templates/shared_services/sonatype-nexus-vm/Dockerfile.tmpl b/templates/shared_services/sonatype-nexus-vm/Dockerfile.tmpl index 4b5deb9d3a..4494f207a1 100644 --- a/templates/shared_services/sonatype-nexus-vm/Dockerfile.tmpl +++ b/templates/shared_services/sonatype-nexus-vm/Dockerfile.tmpl @@ -1,5 +1,5 @@ # syntax=docker/dockerfile-upstream:1.4.0 -FROM --platform=linux/amd64 debian:bullseye-slim +FROM --platform=linux/amd64 debian:bookworm-slim # PORTER_INIT diff --git a/templates/shared_services/sonatype-nexus-vm/porter.yaml b/templates/shared_services/sonatype-nexus-vm/porter.yaml index ee9701b05f..534b8684ff 100644 --- a/templates/shared_services/sonatype-nexus-vm/porter.yaml +++ b/templates/shared_services/sonatype-nexus-vm/porter.yaml @@ -1,7 +1,7 @@ --- schemaVersion: 1.0.0 name: tre-shared-service-sonatype-nexus -version: 3.1.0 +version: 3.1.1 description: "A Sonatype Nexus shared service" dockerfile: Dockerfile.tmpl registry: azuretre @@ -76,7 +76,7 @@ outputs: mixins: - exec - terraform: - clientVersion: 1.4.5 + clientVersion: 1.9.8 install: - terraform: diff --git a/templates/workspace_services/azureml/Dockerfile.tmpl b/templates/workspace_services/azureml/Dockerfile.tmpl index 7e29cfb0af..44ffe027c8 100644 --- a/templates/workspace_services/azureml/Dockerfile.tmpl +++ b/templates/workspace_services/azureml/Dockerfile.tmpl @@ -1,5 +1,5 @@ # syntax=docker/dockerfile-upstream:1.4.0 -FROM --platform=linux/amd64 debian:bullseye-slim +FROM --platform=linux/amd64 debian:bookworm-slim # PORTER_INIT diff --git a/templates/workspace_services/azureml/porter.yaml b/templates/workspace_services/azureml/porter.yaml index ab04640b47..ca607547b3 100644 --- a/templates/workspace_services/azureml/porter.yaml +++ b/templates/workspace_services/azureml/porter.yaml @@ -1,7 +1,7 @@ --- schemaVersion: 1.0.0 name: tre-service-azureml -version: 0.8.15 +version: 0.8.16 description: "An Azure TRE service for Azure Machine Learning" registry: azuretre dockerfile: Dockerfile.tmpl @@ -118,9 +118,9 @@ outputs: mixins: - terraform: - clientVersion: 1.3.6 + clientVersion: 1.9.8 - az: - clientVersion: 2.37.0 + clientVersion: 2.67.0 install: - terraform: diff --git a/templates/workspace_services/azureml/user_resources/aml_compute/Dockerfile.tmpl b/templates/workspace_services/azureml/user_resources/aml_compute/Dockerfile.tmpl index 4b5deb9d3a..4494f207a1 100644 --- a/templates/workspace_services/azureml/user_resources/aml_compute/Dockerfile.tmpl +++ b/templates/workspace_services/azureml/user_resources/aml_compute/Dockerfile.tmpl @@ -1,5 +1,5 @@ # syntax=docker/dockerfile-upstream:1.4.0 -FROM --platform=linux/amd64 debian:bullseye-slim +FROM --platform=linux/amd64 debian:bookworm-slim # PORTER_INIT diff --git a/templates/workspace_services/azureml/user_resources/aml_compute/porter.yaml b/templates/workspace_services/azureml/user_resources/aml_compute/porter.yaml index 767f290f36..a70844a77f 100644 --- a/templates/workspace_services/azureml/user_resources/aml_compute/porter.yaml +++ b/templates/workspace_services/azureml/user_resources/aml_compute/porter.yaml @@ -57,9 +57,9 @@ parameters: mixins: - exec - az: - clientVersion: 2.37.0 + clientVersion: 2.67.0 - terraform: - clientVersion: 1.3.6 + clientVersion: 1.9.8 install: - terraform: diff --git a/templates/workspace_services/azuresql/Dockerfile.tmpl b/templates/workspace_services/azuresql/Dockerfile.tmpl index c584174140..abc241c3a1 100644 --- a/templates/workspace_services/azuresql/Dockerfile.tmpl +++ b/templates/workspace_services/azuresql/Dockerfile.tmpl @@ -1,5 +1,5 @@ # syntax=docker/dockerfile-upstream:1.4.0 -FROM --platform=linux/amd64 debian:bullseye-slim +FROM --platform=linux/amd64 debian:bookworm-slim # PORTER_INIT diff --git a/templates/workspace_services/azuresql/porter.yaml b/templates/workspace_services/azuresql/porter.yaml index f0508b6446..5a71843341 100644 --- a/templates/workspace_services/azuresql/porter.yaml +++ b/templates/workspace_services/azuresql/porter.yaml @@ -1,7 +1,7 @@ --- schemaVersion: 1.0.0 name: tre-workspace-service-azuresql -version: 1.0.13 +version: 1.0.14 description: "An Azure SQL workspace service" registry: azuretre dockerfile: Dockerfile.tmpl @@ -58,7 +58,7 @@ parameters: mixins: - exec - terraform: - clientVersion: 1.9.2 + clientVersion: 1.9.8 outputs: - name: azuresql_fqdn diff --git a/templates/workspace_services/databricks/Dockerfile.tmpl b/templates/workspace_services/databricks/Dockerfile.tmpl index 076d4cbb5b..c85d6bd038 100644 --- a/templates/workspace_services/databricks/Dockerfile.tmpl +++ b/templates/workspace_services/databricks/Dockerfile.tmpl @@ -1,5 +1,5 @@ # syntax=docker/dockerfile-upstream:1.4.0 -FROM --platform=linux/amd64 debian:bullseye-slim +FROM --platform=linux/amd64 debian:bookworm-slim # PORTER_INIT diff --git a/templates/workspace_services/databricks/porter.yaml b/templates/workspace_services/databricks/porter.yaml index 5c6ac9b030..d499dade92 100644 --- a/templates/workspace_services/databricks/porter.yaml +++ b/templates/workspace_services/databricks/porter.yaml @@ -1,7 +1,7 @@ --- schemaVersion: 1.0.0 name: tre-service-databricks -version: 1.0.8 +version: 1.0.9 description: "An Azure TRE service for Azure Databricks." registry: azuretre dockerfile: Dockerfile.tmpl @@ -103,7 +103,7 @@ outputs: mixins: - terraform: - clientVersion: 1.3.6 + clientVersion: 1.9.8 install: - terraform: diff --git a/templates/workspace_services/gitea/Dockerfile.tmpl b/templates/workspace_services/gitea/Dockerfile.tmpl index c584174140..abc241c3a1 100644 --- a/templates/workspace_services/gitea/Dockerfile.tmpl +++ b/templates/workspace_services/gitea/Dockerfile.tmpl @@ -1,5 +1,5 @@ # syntax=docker/dockerfile-upstream:1.4.0 -FROM --platform=linux/amd64 debian:bullseye-slim +FROM --platform=linux/amd64 debian:bookworm-slim # PORTER_INIT diff --git a/templates/workspace_services/gitea/porter.yaml b/templates/workspace_services/gitea/porter.yaml index 1d648b0c25..6f756cb438 100644 --- a/templates/workspace_services/gitea/porter.yaml +++ b/templates/workspace_services/gitea/porter.yaml @@ -70,7 +70,7 @@ parameters: mixins: - exec - terraform: - clientVersion: 1.3.6 + clientVersion: 1.9.8 outputs: - name: connection_uri diff --git a/templates/workspace_services/guacamole/Dockerfile.tmpl b/templates/workspace_services/guacamole/Dockerfile.tmpl index c584174140..abc241c3a1 100644 --- a/templates/workspace_services/guacamole/Dockerfile.tmpl +++ b/templates/workspace_services/guacamole/Dockerfile.tmpl @@ -1,5 +1,5 @@ # syntax=docker/dockerfile-upstream:1.4.0 -FROM --platform=linux/amd64 debian:bullseye-slim +FROM --platform=linux/amd64 debian:bookworm-slim # PORTER_INIT diff --git a/templates/workspace_services/guacamole/porter.yaml b/templates/workspace_services/guacamole/porter.yaml index 912ce1d44e..7222122624 100644 --- a/templates/workspace_services/guacamole/porter.yaml +++ b/templates/workspace_services/guacamole/porter.yaml @@ -125,7 +125,7 @@ outputs: mixins: - terraform: - clientVersion: 1.4.6 + clientVersion: 1.9.8 install: - terraform: diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-export-reviewvm/Dockerfile.tmpl b/templates/workspace_services/guacamole/user_resources/guacamole-azure-export-reviewvm/Dockerfile.tmpl index 4b5deb9d3a..4494f207a1 100644 --- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-export-reviewvm/Dockerfile.tmpl +++ b/templates/workspace_services/guacamole/user_resources/guacamole-azure-export-reviewvm/Dockerfile.tmpl @@ -1,5 +1,5 @@ # syntax=docker/dockerfile-upstream:1.4.0 -FROM --platform=linux/amd64 debian:bullseye-slim +FROM --platform=linux/amd64 debian:bookworm-slim # PORTER_INIT diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-export-reviewvm/porter.yaml b/templates/workspace_services/guacamole/user_resources/guacamole-azure-export-reviewvm/porter.yaml index 39d3f471cb..3affcfa3c9 100644 --- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-export-reviewvm/porter.yaml +++ b/templates/workspace_services/guacamole/user_resources/guacamole-azure-export-reviewvm/porter.yaml @@ -103,9 +103,9 @@ outputs: mixins: - exec - terraform: - clientVersion: 1.3.6 + clientVersion: 1.9.8 - az: - clientVersion: 2.37.0 + clientVersion: 2.67.0 install: - terraform: diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-import-reviewvm/Dockerfile.tmpl b/templates/workspace_services/guacamole/user_resources/guacamole-azure-import-reviewvm/Dockerfile.tmpl index 4b5deb9d3a..4494f207a1 100644 --- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-import-reviewvm/Dockerfile.tmpl +++ b/templates/workspace_services/guacamole/user_resources/guacamole-azure-import-reviewvm/Dockerfile.tmpl @@ -1,5 +1,5 @@ # syntax=docker/dockerfile-upstream:1.4.0 -FROM --platform=linux/amd64 debian:bullseye-slim +FROM --platform=linux/amd64 debian:bookworm-slim # PORTER_INIT diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-import-reviewvm/porter.yaml b/templates/workspace_services/guacamole/user_resources/guacamole-azure-import-reviewvm/porter.yaml index e2beac65d7..4ec556a834 100644 --- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-import-reviewvm/porter.yaml +++ b/templates/workspace_services/guacamole/user_resources/guacamole-azure-import-reviewvm/porter.yaml @@ -112,9 +112,9 @@ outputs: mixins: - exec - terraform: - clientVersion: 1.3.6 + clientVersion: 1.9.8 - az: - clientVersion: 2.37.0 + clientVersion: 2.67.0 install: - terraform: diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/Dockerfile.tmpl b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/Dockerfile.tmpl index 4b5deb9d3a..4494f207a1 100644 --- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/Dockerfile.tmpl +++ b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/Dockerfile.tmpl @@ -1,5 +1,5 @@ # syntax=docker/dockerfile-upstream:1.4.0 -FROM --platform=linux/amd64 debian:bullseye-slim +FROM --platform=linux/amd64 debian:bookworm-slim # PORTER_INIT diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/porter.yaml b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/porter.yaml index 9f90933613..091768da8c 100644 --- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/porter.yaml +++ b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/porter.yaml @@ -121,9 +121,9 @@ outputs: mixins: - exec - terraform: - clientVersion: 1.3.6 + clientVersion: 1.9.8 - az: - clientVersion: 2.37.0 + clientVersion: 2.67.0 install: - terraform: diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-windowsvm/Dockerfile.tmpl b/templates/workspace_services/guacamole/user_resources/guacamole-azure-windowsvm/Dockerfile.tmpl index 4b5deb9d3a..4494f207a1 100644 --- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-windowsvm/Dockerfile.tmpl +++ b/templates/workspace_services/guacamole/user_resources/guacamole-azure-windowsvm/Dockerfile.tmpl @@ -1,5 +1,5 @@ # syntax=docker/dockerfile-upstream:1.4.0 -FROM --platform=linux/amd64 debian:bullseye-slim +FROM --platform=linux/amd64 debian:bookworm-slim # PORTER_INIT diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-windowsvm/porter.yaml b/templates/workspace_services/guacamole/user_resources/guacamole-azure-windowsvm/porter.yaml index 6be6dc0de3..d35d689050 100644 --- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-windowsvm/porter.yaml +++ b/templates/workspace_services/guacamole/user_resources/guacamole-azure-windowsvm/porter.yaml @@ -130,7 +130,7 @@ mixins: - terraform: clientVersion: 1.4.6 - az: - clientVersion: 2.37.0 + clientVersion: 2.67.0 install: - terraform: diff --git a/templates/workspace_services/health-services/Dockerfile.tmpl b/templates/workspace_services/health-services/Dockerfile.tmpl index 7e29cfb0af..44ffe027c8 100644 --- a/templates/workspace_services/health-services/Dockerfile.tmpl +++ b/templates/workspace_services/health-services/Dockerfile.tmpl @@ -1,5 +1,5 @@ # syntax=docker/dockerfile-upstream:1.4.0 -FROM --platform=linux/amd64 debian:bullseye-slim +FROM --platform=linux/amd64 debian:bookworm-slim # PORTER_INIT diff --git a/templates/workspace_services/health-services/porter.yaml b/templates/workspace_services/health-services/porter.yaml index cd615957f1..011ecc8b77 100644 --- a/templates/workspace_services/health-services/porter.yaml +++ b/templates/workspace_services/health-services/porter.yaml @@ -1,7 +1,7 @@ --- schemaVersion: 1.0.0 name: tre-workspace-service-health -version: 0.2.9 +version: 0.2.10 description: "An Azure Data Health Services workspace service" registry: azuretre dockerfile: Dockerfile.tmpl @@ -86,9 +86,9 @@ outputs: mixins: - terraform: - clientVersion: 1.3.6 + clientVersion: 1.9.8 - az: - clientVersion: 2.37.0 + clientVersion: 2.67.0 install: - terraform: diff --git a/templates/workspace_services/mysql/Dockerfile.tmpl b/templates/workspace_services/mysql/Dockerfile.tmpl index c584174140..abc241c3a1 100644 --- a/templates/workspace_services/mysql/Dockerfile.tmpl +++ b/templates/workspace_services/mysql/Dockerfile.tmpl @@ -1,5 +1,5 @@ # syntax=docker/dockerfile-upstream:1.4.0 -FROM --platform=linux/amd64 debian:bullseye-slim +FROM --platform=linux/amd64 debian:bookworm-slim # PORTER_INIT diff --git a/templates/workspace_services/mysql/porter.yaml b/templates/workspace_services/mysql/porter.yaml index 11372459ec..fd6c71e370 100644 --- a/templates/workspace_services/mysql/porter.yaml +++ b/templates/workspace_services/mysql/porter.yaml @@ -1,7 +1,7 @@ --- schemaVersion: 1.0.0 name: tre-workspace-service-mysql -version: 1.0.7 +version: 1.0.8 description: "A MySQL workspace service" registry: azuretre dockerfile: Dockerfile.tmpl @@ -58,7 +58,7 @@ parameters: mixins: - exec - terraform: - clientVersion: 1.3.6 + clientVersion: 1.9.8 outputs: - name: mysql_fqdn diff --git a/templates/workspace_services/ohdsi/porter.yaml b/templates/workspace_services/ohdsi/porter.yaml index 20aba5ef87..42e92517cf 100644 --- a/templates/workspace_services/ohdsi/porter.yaml +++ b/templates/workspace_services/ohdsi/porter.yaml @@ -1,7 +1,7 @@ --- schemaVersion: 1.0.0 name: tre-workspace-service-ohdsi -version: 0.3.0 +version: 0.3.1 description: "An OHDSI workspace service" registry: azuretre dockerfile: Dockerfile.tmpl @@ -67,9 +67,9 @@ parameters: mixins: - terraform: - clientVersion: 1.4.6 + clientVersion: 1.9.8 - az: - clientVersion: 2.37.0 + clientVersion: 2.67.0 - exec outputs: diff --git a/templates/workspace_services/openai/Dockerfile.tmpl b/templates/workspace_services/openai/Dockerfile.tmpl index c584174140..abc241c3a1 100644 --- a/templates/workspace_services/openai/Dockerfile.tmpl +++ b/templates/workspace_services/openai/Dockerfile.tmpl @@ -1,5 +1,5 @@ # syntax=docker/dockerfile-upstream:1.4.0 -FROM --platform=linux/amd64 debian:bullseye-slim +FROM --platform=linux/amd64 debian:bookworm-slim # PORTER_INIT diff --git a/templates/workspace_services/openai/porter.yaml b/templates/workspace_services/openai/porter.yaml index 452239a19d..0ad52412a3 100644 --- a/templates/workspace_services/openai/porter.yaml +++ b/templates/workspace_services/openai/porter.yaml @@ -1,7 +1,7 @@ --- schemaVersion: 1.0.0 name: tre-workspace-service-openai -version: 1.0.4 +version: 1.0.5 description: "An OpenAI workspace service" registry: azuretre dockerfile: Dockerfile.tmpl @@ -55,7 +55,7 @@ parameters: mixins: - exec - terraform: - clientVersion: 1.3.6 + clientVersion: 1.9.8 outputs: - name: openai_fqdn diff --git a/templates/workspaces/airlock-import-review/Dockerfile.tmpl b/templates/workspaces/airlock-import-review/Dockerfile.tmpl index 14a2ec8469..dcc43bb677 100644 --- a/templates/workspaces/airlock-import-review/Dockerfile.tmpl +++ b/templates/workspaces/airlock-import-review/Dockerfile.tmpl @@ -1,5 +1,5 @@ # syntax=docker/dockerfile-upstream:1.4.0 -FROM --platform=linux/amd64 debian:bullseye-slim +FROM --platform=linux/amd64 debian:bookworm-slim # PORTER_INIT diff --git a/templates/workspaces/airlock-import-review/porter.yaml b/templates/workspaces/airlock-import-review/porter.yaml index 544b94d8b6..3cd8e7c3d2 100644 --- a/templates/workspaces/airlock-import-review/porter.yaml +++ b/templates/workspaces/airlock-import-review/porter.yaml @@ -1,7 +1,7 @@ --- schemaVersion: 1.0.0 name: tre-workspace-airlock-import-review -version: 0.13.4 +version: 0.13.5 description: "A workspace to do Airlock Data Import Reviews for Azure TRE" dockerfile: Dockerfile.tmpl registry: azuretre @@ -148,9 +148,9 @@ outputs: mixins: - exec - terraform: - clientVersion: 1.4.6 + clientVersion: 1.9.8 - az: - clientVersion: 2.49.0 + clientVersion: 2.67.0 install: - terraform: diff --git a/templates/workspaces/base/Dockerfile.tmpl b/templates/workspaces/base/Dockerfile.tmpl index 7e29cfb0af..44ffe027c8 100644 --- a/templates/workspaces/base/Dockerfile.tmpl +++ b/templates/workspaces/base/Dockerfile.tmpl @@ -1,5 +1,5 @@ # syntax=docker/dockerfile-upstream:1.4.0 -FROM --platform=linux/amd64 debian:bullseye-slim +FROM --platform=linux/amd64 debian:bookworm-slim # PORTER_INIT diff --git a/templates/workspaces/base/porter.yaml b/templates/workspaces/base/porter.yaml index 75ee4374a1..1cdc6d24a6 100644 --- a/templates/workspaces/base/porter.yaml +++ b/templates/workspaces/base/porter.yaml @@ -1,7 +1,7 @@ --- schemaVersion: 1.0.0 name: tre-workspace-base -version: 1.7.0 +version: 1.7.1 description: "A base Azure TRE workspace" dockerfile: Dockerfile.tmpl registry: azuretre @@ -158,9 +158,9 @@ outputs: mixins: - exec - terraform: - clientVersion: 1.4.6 + clientVersion: 1.9.8 - az: - clientVersion: 2.49.0 + clientVersion: 2.67.0 install: - terraform: diff --git a/templates/workspaces/unrestricted/Dockerfile.tmpl b/templates/workspaces/unrestricted/Dockerfile.tmpl index c9320805e7..04eaf4f8c0 100644 --- a/templates/workspaces/unrestricted/Dockerfile.tmpl +++ b/templates/workspaces/unrestricted/Dockerfile.tmpl @@ -1,5 +1,5 @@ # syntax=docker/dockerfile-upstream:1.4.0 -FROM --platform=linux/amd64 debian:bullseye-slim +FROM --platform=linux/amd64 debian:bookworm-slim # PORTER_INIT diff --git a/templates/workspaces/unrestricted/porter.yaml b/templates/workspaces/unrestricted/porter.yaml index 8efa40a2c7..97f1531997 100644 --- a/templates/workspaces/unrestricted/porter.yaml +++ b/templates/workspaces/unrestricted/porter.yaml @@ -1,7 +1,7 @@ --- schemaVersion: 1.0.0 name: tre-workspace-unrestricted -version: 0.12.4 +version: 0.12.5 description: "A base Azure TRE workspace" dockerfile: Dockerfile.tmpl registry: azuretre @@ -154,9 +154,9 @@ outputs: mixins: - exec - terraform: - clientVersion: 1.4.6 + clientVersion: 1.9.8 - az: - clientVersion: 2.49.0 + clientVersion: 2.67.0 install: - terraform: