about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJosh Stone <jistone@redhat.com>2023-07-21 10:41:57 -0700
committerJosh Stone <jistone@redhat.com>2023-07-21 12:22:25 -0700
commitd34a2b18704242a2527ee84ad46f0aed9f466fbe (patch)
tree3ce4024e49b52b94d7a48e43029eaaffc24294e6
parente9e424854973b8cc8cf58911067231a6de7fd1be (diff)
downloadrust-d34a2b18704242a2527ee84ad46f0aed9f466fbe.tar.gz
rust-d34a2b18704242a2527ee84ad46f0aed9f466fbe.zip
ci: Update x86_64-gnu-nopt to ubuntu:22.04
-rw-r--r--src/ci/docker/host-x86_64/x86_64-gnu-nopt/Dockerfile8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/ci/docker/host-x86_64/x86_64-gnu-nopt/Dockerfile b/src/ci/docker/host-x86_64/x86_64-gnu-nopt/Dockerfile
index 1452c00a5d8..d8113e06723 100644
--- a/src/ci/docker/host-x86_64/x86_64-gnu-nopt/Dockerfile
+++ b/src/ci/docker/host-x86_64/x86_64-gnu-nopt/Dockerfile
@@ -1,7 +1,8 @@
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 # Avoid interactive prompts while installing `tzdata` dependency with `DEBIAN_FRONTEND`.
-RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+ARG DEBIAN_FRONTEND=noninteractive
+RUN apt-get update && apt-get install -y --no-install-recommends \
   g++ \
   make \
   ninja-build \
@@ -18,9 +19,6 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
   xz-utils \
   && rm -rf /var/lib/apt/lists/*
 
-COPY scripts/cmake.sh /scripts/
-RUN /scripts/cmake.sh
-
 COPY scripts/sccache.sh /scripts/
 RUN sh /scripts/sccache.sh