Upgrade Ubuntu container to 22.04

Signed-off-by: Victor Vasiliev <[email protected]>
envoyproxy · Nov 29, 2023 · 8a294e8 · 8a294e8
1 parent 7761e1e
commit 8a294e8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/docker/linux/common_fun.sh b/docker/linux/common_fun.sh
@@ -125,9 +125,9 @@ install_build () {
 setup_tcpdump () {
     # Setup tcpdump for non-root.
     groupadd -r pcap
-    chgrp pcap /usr/sbin/tcpdump
-    chmod 750 /usr/sbin/tcpdump
-    setcap cap_net_raw,cap_net_admin=eip /usr/sbin/tcpdump
+    chgrp pcap /usr/bin/tcpdump
+    chmod 750 /usr/bin/tcpdump
+    setcap cap_net_raw,cap_net_admin=eip /usr/bin/tcpdump
 }
 
 ## PPCLE64 FUN

diff --git a/docker/linux/ubuntu/Dockerfile b/docker/linux/ubuntu/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:focal@sha256:33a5cc25d22c45900796a1aca487ad7a7cb09f09ea00b779e3b2026b4fc2faba as env
+FROM ubuntu:jammy@sha256:c9cf959fd83770dfdefd8fb42cfef0761432af36a764c077aed54bbc5bb25368 as env
 ARG ANDROID_CLI_TOOLS=https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip \
     APT_KEY_TOOLCHAIN=60C317803A41BA51845E371A1E9377A2BA9EF27F \
     APT_KEY_AZUL=0xB1998361219BD9C9 \
@@ -79,8 +79,8 @@ COPY \
 FROM full as cmake
 RUN --mount=type=tmpfs,target=/var/cache/apt \
     --mount=type=tmpfs,target=/var/lib/apt/lists \
-    curl -fsSL https://apt.kitware.com/keys/kitware-archive-latest.asc | apt-key add - \
-    && echo "deb https://apt.kitware.com/ubuntu/ focal main" >> /etc/apt/sources.list \
+    curl -fsSL https://apt.kitware.com/keys/kitware-archive-latest.asc -o /etc/apt/trusted.gpg.d/kitware.asc \
+    && echo "deb https://apt.kitware.com/ubuntu/ jammy main" >> /etc/apt/sources.list \
     && apt-get -qq update -y \
     && apt-get -qq install --no-install-recommends cmake ninja-build
 

diff --git a/docker/linux/ubuntu/fun.sh b/docker/linux/ubuntu/fun.sh
@@ -94,7 +94,7 @@ add_ubuntu_keys () {
 
 add_apt_key () {
     apt-get update -y
-    wget -q -O - "$1" | apt-key add -
+    wget -q -O - "$1" > /etc/apt/trusted.gpg.d/"$2"
 }
 
 add_apt_k8s_key () {
@@ -174,7 +174,7 @@ install () {
     if [[ "$ARCH" == "ppc64le" ]]; then
         install_ppc64le_bazel
     fi
-    add_apt_key "${APT_KEY_DOCKER}"
+    add_apt_key "${APT_KEY_DOCKER}" "docker.asc"
     add_apt_k8s_key "${APT_KEY_K8S}"
     add_apt_repos "${APT_REPOS[@]}"
     apt-get -qq update
@@ -195,7 +195,7 @@ install_ci () {
 }
 
 install_llvm () {
-    add_apt_key "${APT_KEY_KITWARE}"
+    add_apt_key "${APT_KEY_KITWARE}" "kitware.asc"
     add_apt_repos "${APT_REPOS_LLVM[@]}"
     apt-get -qq update -y
     apt-get -qq install -y --no-install-recommends "${LLVM_PACKAGES[@]}"