aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2022-04-26 14:41:05 +0000
committerGitHub <noreply@github.com>2022-04-26 14:41:05 +0000
commit0ce3b067a84cd4a44fbfcb64a1669e18ed29b7f0 (patch)
treeae34a5c58fdc934e19830e7dc4eab8c1db2994ac
parentab845217887468b500b624f0837023122002c534 (diff)
parent10427869f157c9d44d745265554f0f1c9f770c0c (diff)
downloadgcc-0ce3b067a84cd4a44fbfcb64a1669e18ed29b7f0.zip
gcc-0ce3b067a84cd4a44fbfcb64a1669e18ed29b7f0.tar.gz
gcc-0ce3b067a84cd4a44fbfcb64a1669e18ed29b7f0.tar.bz2
Merge #1171
1171: Dockerfile: change base image r=philberty a=liushuyu - Dockerfile: change base image This commit fixes a recent Docker building error where the GLibc version mismatches. Co-authored-by: liushuyu <liushuyu011@gmail.com>
-rw-r--r--Dockerfile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Dockerfile b/Dockerfile
index 1ca3b16..681a744 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:latest AS gcc-builder
+FROM debian:11 AS gcc-builder
RUN apt-get update; \
DEBIAN_FRONTEND="noninteractive" apt-get install -y --no-install-recommends \
@@ -67,7 +67,7 @@ RUN /bin/sh -c set -ex; \
dpkg-divert --divert /usr/bin/g++.orig --rename /usr/bin/g++; \
update-alternatives --install /usr/bin/cc cc /usr/local/bin/gcc 999
-FROM rust
+FROM rust:latest
COPY --from=gcc-builder /usr/ /usr/
RUN cargo install --git https://github.com/Rust-GCC/cargo-gccrs cargo-gccrs