From 9bc24a33e97788fb19f64572efc8eff9de27d9f5 Mon Sep 17 00:00:00 2001 From: Jing Chen Date: Thu, 22 Aug 2024 14:15:37 -0700 Subject: [PATCH] Upgrade gVisor images to use ubuntu:jammy as the base image. ubuntu:jammy is 22.04, which is a LTS version. This is the second wave. PiperOrigin-RevId: 666485330 --- images/benchmarks/syscallbench/Dockerfile.x86_64 | 2 +- images/benchmarks/util/Dockerfile | 2 +- images/benchmarks/wrk2/Dockerfile | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/images/benchmarks/syscallbench/Dockerfile.x86_64 b/images/benchmarks/syscallbench/Dockerfile.x86_64 index 26bc0c563..0497c2047 100644 --- a/images/benchmarks/syscallbench/Dockerfile.x86_64 +++ b/images/benchmarks/syscallbench/Dockerfile.x86_64 @@ -1,4 +1,4 @@ -FROM ubuntu:18.04 +FROM ubuntu:jammy RUN set -x \ && apt-get update \ diff --git a/images/benchmarks/util/Dockerfile b/images/benchmarks/util/Dockerfile index f2799b3e6..a64c0f61a 100644 --- a/images/benchmarks/util/Dockerfile +++ b/images/benchmarks/util/Dockerfile @@ -1,3 +1,3 @@ -FROM ubuntu:bionic +FROM ubuntu:jammy RUN apt-get update && apt-get install -y wget diff --git a/images/benchmarks/wrk2/Dockerfile b/images/benchmarks/wrk2/Dockerfile index 8497cb2a6..9255f1649 100644 --- a/images/benchmarks/wrk2/Dockerfile +++ b/images/benchmarks/wrk2/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:20.04 as build +FROM ubuntu:jammy as build # Install build dependencies: RUN apt-get update && apt-get install -y git build-essential libssl-dev libz-dev @@ -22,7 +22,7 @@ RUN cd /tmp/wrk2 \ # Make. RUN cd /tmp/wrk2 && make -FROM ubuntu:20.04 +FROM ubuntu:jammy RUN set -x \ && apt-get update \ && apt-get install -y \