Upgrade all docker base images to bullseye (#2946)

* Upgrade all docker base images to bullseye * Up RP version * remove jq version * Remvoe buster comments * Revert cli version and update changelog * add pinned packages back. * Update _version.py * Update _version.py Co-authored-by: Tamir Kamara <26870601+tamirkamara@users.noreply.github.com>
microsoft · Dec 8, 2022 · d692717 · d692717
1 parent 9193390
commit d692717
Show file tree

Hide file tree

Showing 25 changed files with 31 additions and 33 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -2,7 +2,7 @@
 
 # [Choice] Python version: 3, 3.9, 3.8, 3.7, 3.6
 ARG VARIANT="3.8"
-FROM mcr.microsoft.com/vscode/devcontainers/python:dev-${VARIANT}-buster
+FROM mcr.microsoft.com/vscode/devcontainers/python:dev-${VARIANT}-bullseye
 
 # This will be set to true when running in VSCode
 ARG INTERACTIVE="false"
@@ -37,7 +37,7 @@ RUN apt-get update && apt-get install -y ca-certificates curl gnupg lsb-release
     && curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg \
     && echo "deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian $(lsb_release -cs) stable" \
     | tee /etc/apt/sources.list.d/docker.list > /dev/null \
-    && apt-get update && apt-get install -y docker-ce="5:20.10.20~3-0~debian-buster" docker-ce-cli="5:20.10.20~3-0~debian-buster" containerd.io="1.6.10-1" --no-install-recommends \
+    && apt-get update && apt-get install -y docker-ce="5:20.10.21~3-0~debian-bullseye" docker-ce-cli="5:20.10.21~3-0~debian-bullseye" containerd.io="1.6.12-1" --no-install-recommends \
     && apt-get clean -y && rm -rf /var/lib/apt/lists/*
 
 # Install Certbot
@@ -79,7 +79,7 @@ COPY ["airlock_processor/requirements.txt", "/tmp/pip-tmp/airlock_processor/"]
 RUN pip3 --disable-pip-version-check --no-cache-dir install -r /tmp/pip-tmp/requirements.txt && rm -rf /tmp/pip-tmp
 
 # Install azure-cli
-ARG AZURE_CLI_VERSION=2.37.0-1~buster
+ARG AZURE_CLI_VERSION=2.37.0-1~bullseye
 COPY .devcontainer/scripts/azure-cli.sh /tmp/
 RUN export AZURE_CLI_VERSION=${AZURE_CLI_VERSION} \
     && /tmp/azure-cli.sh

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@ ENHANCEMENTS:
 * Remove Porter's Docker mixin as it's not in use ([#2889](https://github.com/microsoft/AzureTRE/pull/2889))
 * Enable properties defined within the API to be overridden by the bundle template - enables default values to be set. ([#2576](https://github.com/microsoft/AzureTRE/pull/2576))
 * Support template version update ([#2908](https://github.com/microsoft/AzureTRE/pull/2908))
+* Update docker base images to bullseye ([#2946](https://github.com/microsoft/AzureTRE/pull/2946)
 * Support updating the firewall when installing via makefile/CICD ([#2942](https://github.com/microsoft/AzureTRE/pull/2942))
 
 BUG FIXES:

diff --git a/api_app/Dockerfile b/api_app/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.8-slim-buster as base
+FROM python:3.8-slim-bullseye as base
 COPY requirements.txt /.
 RUN pip3 install --no-cache-dir -r requirements.txt
 

diff --git a/api_app/_version.py b/api_app/_version.py
@@ -1 +1 @@
-__version__ = "0.6.3"
+__version__ = "0.6.4"
diff --git a/resource_processor/_version.py b/resource_processor/_version.py
@@ -1 +1 @@
-__version__ = "0.4.13"
+__version__ = "0.4.14"
diff --git a/resource_processor/vmss_porter/Dockerfile b/resource_processor/vmss_porter/Dockerfile
@@ -1,9 +1,9 @@
-FROM python:3.8-slim-buster
+FROM python:3.8-slim-bullseye
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
 # Install Azure CLI
-ARG AZURE_CLI_VERSION=2.40.0-1~buster
+ARG AZURE_CLI_VERSION=2.40.0-1~bullseye
 COPY scripts/azure-cli.sh /tmp/
 RUN export AZURE_CLI_VERSION=${AZURE_CLI_VERSION} \
     && /tmp/azure-cli.sh
@@ -32,11 +32,11 @@ RUN apt-get update && apt-get install -y apt-transport-https ca-certificates cur
     && curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg \
     && echo "deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian $(lsb_release -cs) stable" \
     | tee /etc/apt/sources.list.d/docker.list > /dev/null \
-    && apt-get update && apt-get install -y docker-ce="5:20.10.20~3-0~debian-buster" docker-ce-cli="5:20.10.20~3-0~debian-buster" containerd.io="1.6.10-1" --no-install-recommends \
+    && apt-get update && apt-get install -y docker-ce="5:20.10.21~3-0~debian-bullseye" docker-ce-cli="5:20.10.21~3-0~debian-bullseye" containerd.io="1.6.12-1" --no-install-recommends \
     && apt-get clean -y && rm -rf /var/lib/apt/lists/*
 
 # Install jq
-RUN apt-get update && apt-get install -y jq="1.5+dfsg-2+b1" --no-install-recommends && apt-get clean -y && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y jq="1.6-2.1" --no-install-recommends && apt-get clean -y && rm -rf /var/lib/apt/lists/*
 
 ENV PYTHONPATH .
 

diff --git a/templates/shared_services/admin-vm/Dockerfile.tmpl b/templates/shared_services/admin-vm/Dockerfile.tmpl
@@ -1,4 +1,4 @@
-FROM debian:buster-slim
+FROM debian:bullseye-slim
 
 ARG BUNDLE_DIR
 

diff --git a/templates/shared_services/airlock_notifier/Dockerfile.tmpl b/templates/shared_services/airlock_notifier/Dockerfile.tmpl
@@ -1,4 +1,4 @@
-FROM debian:buster-slim
+FROM debian:bullseye-slim
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 

diff --git a/templates/shared_services/certs/Dockerfile.tmpl b/templates/shared_services/certs/Dockerfile.tmpl
@@ -1,4 +1,4 @@
-FROM python:3.8-slim-buster
+FROM python:3.8-slim-bullseye
 
 ARG BUNDLE_DIR
 

diff --git a/templates/shared_services/cyclecloud/Dockerfile.tmpl b/templates/shared_services/cyclecloud/Dockerfile.tmpl
@@ -1,4 +1,4 @@
-FROM debian:buster-slim
+FROM debian:bullseye-slim
 
 ARG BUNDLE_DIR
 

diff --git a/templates/shared_services/firewall/Dockerfile.tmpl b/templates/shared_services/firewall/Dockerfile.tmpl
@@ -1,4 +1,4 @@
-FROM debian:buster-slim
+FROM debian:bullseye-slim
 
 ARG BUNDLE_DIR
 

diff --git a/templates/shared_services/gitea/Dockerfile.tmpl b/templates/shared_services/gitea/Dockerfile.tmpl
@@ -1,4 +1,4 @@
-FROM debian:buster-slim
+FROM debian:bullseye-slim
 
 ARG BUNDLE_DIR
 

diff --git a/templates/shared_services/sonatype-nexus-vm/Dockerfile.tmpl b/templates/shared_services/sonatype-nexus-vm/Dockerfile.tmpl
@@ -1,4 +1,4 @@
-FROM debian:buster-slim
+FROM debian:bullseye-slim
 
 ARG BUNDLE_DIR
 

diff --git a/templates/workspace_services/gitea/Dockerfile.tmpl b/templates/workspace_services/gitea/Dockerfile.tmpl
@@ -1,4 +1,4 @@
-FROM debian:buster-slim
+FROM debian:bullseye-slim
 
 ARG BUNDLE_DIR
 

diff --git a/templates/workspace_services/guacamole/Dockerfile.tmpl b/templates/workspace_services/guacamole/Dockerfile.tmpl
@@ -1,4 +1,4 @@
-FROM debian:buster-slim
+FROM debian:bullseye-slim
 
 ARG BUNDLE_DIR
 

diff --git a/...rkspace_services/guacamole/user_resources/guacamole-azure-export-reviewvm/Dockerfile.tmpl b/...rkspace_services/guacamole/user_resources/guacamole-azure-export-reviewvm/Dockerfile.tmpl
@@ -1,4 +1,4 @@
-FROM debian:buster-slim
+FROM debian:bullseye-slim
 
 ARG BUNDLE_DIR
 

diff --git a/...rkspace_services/guacamole/user_resources/guacamole-azure-import-reviewvm/Dockerfile.tmpl b/...rkspace_services/guacamole/user_resources/guacamole-azure-import-reviewvm/Dockerfile.tmpl
@@ -1,4 +1,4 @@
-FROM debian:buster-slim
+FROM debian:bullseye-slim
 
 ARG BUNDLE_DIR
 

diff --git a/...lates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/Dockerfile.tmpl b/...lates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/Dockerfile.tmpl
@@ -1,4 +1,4 @@
-FROM debian:buster-slim
+FROM debian:bullseye-slim
 
 ARG BUNDLE_DIR
 

diff --git a/...tes/workspace_services/guacamole/user_resources/guacamole-azure-windowsvm/Dockerfile.tmpl b/...tes/workspace_services/guacamole/user_resources/guacamole-azure-windowsvm/Dockerfile.tmpl
@@ -1,4 +1,4 @@
-FROM debian:buster-slim
+FROM debian:bullseye-slim
 
 ARG BUNDLE_DIR
 

diff --git a/templates/workspace_services/mlflow/Dockerfile.tmpl b/templates/workspace_services/mlflow/Dockerfile.tmpl
@@ -1,4 +1,4 @@
-FROM debian:buster-slim
+FROM debian:bullseye-slim
 
 ARG BUNDLE_DIR
 

diff --git a/templates/workspace_services/mlflow/mlflow-server/docker/Dockerfile b/templates/workspace_services/mlflow/mlflow-server/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.8-buster
+FROM python:3.8-bullseye
 
 # Install MLflow Python Packages
 RUN pip install --no-cache-dir psycopg2==2.9.5 mlflow==2.0.1 azure-storage-blob==12.14.1

diff --git a/templates/workspace_services/mysql/Dockerfile.tmpl b/templates/workspace_services/mysql/Dockerfile.tmpl
@@ -1,4 +1,4 @@
-FROM debian:buster-slim
+FROM debian:bullseye-slim
 
 ARG BUNDLE_DIR
 

diff --git a/templates/workspaces/airlock-import-review/Dockerfile.tmpl b/templates/workspaces/airlock-import-review/Dockerfile.tmpl
@@ -1,5 +1,4 @@
-# We need azurecli 2.37+ which doesn't exist for strech so the minimum is buster
-FROM debian:buster-slim
+FROM debian:bullseye-slim
 
 ARG BUNDLE_DIR
 

diff --git a/templates/workspaces/base/Dockerfile.tmpl b/templates/workspaces/base/Dockerfile.tmpl
@@ -1,11 +1,10 @@
-# We need azurecli 2.37+ which doesn't exist for strech so the minimum is buster
-FROM debian:buster-slim
+FROM debian:bullseye-slim
 
 ARG BUNDLE_DIR
 
 # Install jq
 RUN apt-get update && \
-    apt-get install -y jq="1.5+dfsg-2+b1" --no-install-recommends && \
+    apt-get install -y jq="1.6-2.1" --no-install-recommends && \
     apt-get clean -y && rm -rf /var/lib/apt/lists/*
 
 # This is a template Dockerfile for the bundle's invocation image

diff --git a/templates/workspaces/unrestricted/Dockerfile.tmpl b/templates/workspaces/unrestricted/Dockerfile.tmpl
@@ -1,5 +1,4 @@
-# We need azurecli 2.37+ which doesn't exist for strech so the minimum is buster
-FROM debian:buster-slim
+FROM debian:bullseye-slim
 
 ARG BUNDLE_DIR