gistfile1.txt

Subject: [PATCH] Update Ubuntu for FIPS support
---
Index: docker/build-tools/Dockerfile
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/docker/build-tools/Dockerfile b/docker/build-tools/Dockerfile
--- a/docker/build-tools/Dockerfile	(revision 0656098c634dacfc286b2d8c24f12165964f2877)
+++ b/docker/build-tools/Dockerfile	(date 1697130028201)
@@ -671,7 +671,7 @@
 # Clang+LLVM
 ##############
 
-FROM ubuntu:xenial AS clang_context_amd64
+FROM ubuntu:jammy AS clang_context_amd64
 FROM ubuntu:bionic AS clang_context_arm64
 # hadolint ignore=DL3006
 FROM clang_context_${TARGETARCH} AS clang_context
@@ -763,8 +763,8 @@
 # Final image for proxy
 ########################
 
-FROM ubuntu:xenial AS build_env_proxy_amd64
-ENV UBUNTU_RELEASE_CODE_NAME=xenial
+FROM ubuntu:jammy AS build_env_proxy_amd64
+ENV UBUNTU_RELEASE_CODE_NAME=jammy
 FROM ubuntu:bionic AS build_env_proxy_arm64
 ENV UBUNTU_RELEASE_CODE_NAME=bionic
 # hadolint ignore=DL3006
@@ -780,8 +780,8 @@
 LABEL "io.istio.version"="${VERSION}"
 
 # Docker
-ENV DOCKER_VERSION=5:20.10.7~3-0~ubuntu-${UBUNTU_RELEASE_CODE_NAME}
-ENV CONTAINERD_VERSION=1.4.6-1
+ENV DOCKER_VERSION=5:20.10.14~3-0~ubuntu-${UBUNTU_RELEASE_CODE_NAME}
+ENV CONTAINERD_VERSION=1.6.12-1
 
 # General
 ENV HOME=/home
@@ -884,7 +884,6 @@
     cmake \
     libtool \
     ninja-build \
-    python \
     unzip \
     virtualenv