Merge pull request #625 from tgross35/docker-image-update

Amanieu · web-flow · commit 202ad9ab7f9e · 2024-06-22T16:15:11.000+02:00
Update the Ubuntu docker image to the latest version
diff --git a/ci/docker/aarch64-unknown-linux-gnu/Dockerfile b/ci/docker/aarch64-unknown-linux-gnu/Dockerfile
@@ -1,4 +1,4 @@
-ARG IMAGE=ubuntu:18.04
+ARG IMAGE=ubuntu:24.04
 FROM $IMAGE
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
diff --git a/ci/docker/arm-unknown-linux-gnueabi/Dockerfile b/ci/docker/arm-unknown-linux-gnueabi/Dockerfile
@@ -1,4 +1,4 @@
-ARG IMAGE=ubuntu:18.04
+ARG IMAGE=ubuntu:24.04
 FROM $IMAGE
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
diff --git a/ci/docker/arm-unknown-linux-gnueabihf/Dockerfile b/ci/docker/arm-unknown-linux-gnueabihf/Dockerfile
@@ -1,4 +1,4 @@
-ARG IMAGE=ubuntu:18.04
+ARG IMAGE=ubuntu:24.04
 FROM $IMAGE
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
diff --git a/ci/docker/armv7-unknown-linux-gnueabihf/Dockerfile b/ci/docker/armv7-unknown-linux-gnueabihf/Dockerfile
@@ -1,4 +1,4 @@
-ARG IMAGE=ubuntu:18.04
+ARG IMAGE=ubuntu:24.04
 FROM $IMAGE
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
diff --git a/ci/docker/i586-unknown-linux-gnu/Dockerfile b/ci/docker/i586-unknown-linux-gnu/Dockerfile
@@ -1,4 +1,4 @@
-ARG IMAGE=ubuntu:18.04
+ARG IMAGE=ubuntu:24.04
 FROM $IMAGE
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
diff --git a/ci/docker/i686-unknown-linux-gnu/Dockerfile b/ci/docker/i686-unknown-linux-gnu/Dockerfile
@@ -1,4 +1,4 @@
-ARG IMAGE=ubuntu:18.04
+ARG IMAGE=ubuntu:24.04
 FROM $IMAGE
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
diff --git a/ci/docker/mips-unknown-linux-gnu/Dockerfile b/ci/docker/mips-unknown-linux-gnu/Dockerfile
@@ -1,4 +1,4 @@
-ARG IMAGE=ubuntu:18.04
+ARG IMAGE=ubuntu:24.04
 FROM $IMAGE
 
 RUN apt-get update && \
diff --git a/ci/docker/mips64-unknown-linux-gnuabi64/Dockerfile b/ci/docker/mips64-unknown-linux-gnuabi64/Dockerfile
@@ -1,4 +1,4 @@
-ARG IMAGE=ubuntu:18.04
+ARG IMAGE=ubuntu:24.04
 FROM $IMAGE
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
diff --git a/ci/docker/mips64el-unknown-linux-gnuabi64/Dockerfile b/ci/docker/mips64el-unknown-linux-gnuabi64/Dockerfile
@@ -1,4 +1,4 @@
-ARG IMAGE=ubuntu:18.04
+ARG IMAGE=ubuntu:24.04
 FROM $IMAGE
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
diff --git a/ci/docker/mipsel-unknown-linux-gnu/Dockerfile b/ci/docker/mipsel-unknown-linux-gnu/Dockerfile
@@ -1,4 +1,4 @@
-ARG IMAGE=ubuntu:18.04
+ARG IMAGE=ubuntu:24.04
 FROM $IMAGE
 
 RUN apt-get update && \
diff --git a/ci/docker/powerpc-unknown-linux-gnu/Dockerfile b/ci/docker/powerpc-unknown-linux-gnu/Dockerfile
@@ -1,4 +1,4 @@
-ARG IMAGE=ubuntu:18.04
+ARG IMAGE=ubuntu:24.04
 FROM $IMAGE
 
 RUN apt-get update && \
diff --git a/ci/docker/powerpc64-unknown-linux-gnu/Dockerfile b/ci/docker/powerpc64-unknown-linux-gnu/Dockerfile
@@ -1,4 +1,4 @@
-ARG IMAGE=ubuntu:18.04
+ARG IMAGE=ubuntu:24.04
 FROM $IMAGE
 
 RUN apt-get update && \
diff --git a/ci/docker/powerpc64le-unknown-linux-gnu/Dockerfile b/ci/docker/powerpc64le-unknown-linux-gnu/Dockerfile
@@ -1,4 +1,4 @@
-ARG IMAGE=ubuntu:18.04
+ARG IMAGE=ubuntu:24.04
 FROM $IMAGE
 
 RUN apt-get update && \
diff --git a/ci/docker/thumbv6m-none-eabi/Dockerfile b/ci/docker/thumbv6m-none-eabi/Dockerfile
@@ -1,4 +1,4 @@
-ARG IMAGE=ubuntu:18.04
+ARG IMAGE=ubuntu:24.04
 FROM $IMAGE
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
diff --git a/ci/docker/thumbv7em-none-eabi/Dockerfile b/ci/docker/thumbv7em-none-eabi/Dockerfile
@@ -1,4 +1,4 @@
-ARG IMAGE=ubuntu:18.04
+ARG IMAGE=ubuntu:24.04
 FROM $IMAGE
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
diff --git a/ci/docker/thumbv7em-none-eabihf/Dockerfile b/ci/docker/thumbv7em-none-eabihf/Dockerfile
@@ -1,4 +1,4 @@
-ARG IMAGE=ubuntu:18.04
+ARG IMAGE=ubuntu:24.04
 FROM $IMAGE
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
diff --git a/ci/docker/thumbv7m-none-eabi/Dockerfile b/ci/docker/thumbv7m-none-eabi/Dockerfile
@@ -1,4 +1,4 @@
-ARG IMAGE=ubuntu:18.04
+ARG IMAGE=ubuntu:24.04
 FROM $IMAGE
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
diff --git a/ci/docker/x86_64-unknown-linux-gnu/Dockerfile b/ci/docker/x86_64-unknown-linux-gnu/Dockerfile
@@ -1,4 +1,4 @@
-ARG IMAGE=ubuntu:18.04
+ARG IMAGE=ubuntu:24.04
 FROM $IMAGE
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
diff --git a/ci/run-docker.sh b/ci/run-docker.sh
@@ -76,7 +76,7 @@ if [ "${1:-}" = "--help" ] || [ "$#" -gt 1 ]; then
     usage: ./ci/run-docker.sh [target]
 
     you can also set DOCKER_BASE_IMAGE to use something other than the default
-    ubuntu:18.04 (or rustlang/rust:nightly).
+    ubuntu:24.04 (or rustlang/rust:nightly).
   "
   exit
 fi
diff --git a/testcrate/build.rs b/testcrate/build.rs
@@ -24,9 +24,10 @@ fn main() {
         // FIXME(llvm): There is an ABI incompatibility between GCC and Clang on 32-bit x86.
         // See <https://github.com/llvm/llvm-project/issues/77401>.
         || target.starts_with("i686")
-        // 32-bit PowerPC gets code generated that Qemu cannot handle. See
+        // 32-bit PowerPC and 64-bit LE gets code generated that Qemu cannot handle. See
         // <https://github.com/rust-lang/compiler-builtins/pull/606#issuecomment-2105635926>.
         || target.starts_with("powerpc-")
+        || target.starts_with("powerpc64le-")
         // FIXME: We get different results from the builtin functions. See
         // <https://github.com/rust-lang/compiler-builtins/pull/606#issuecomment-2105657287>.
         || target.starts_with("powerpc64-")

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-ARG IMAGE=ubuntu:18.04`
	`1`	`+ARG IMAGE=ubuntu:24.04`
`2`	`2`	`FROM $IMAGE`
`3`	`3`	`RUN apt-get update && \`
`4`	`4`	`apt-get install -y --no-install-recommends \`