Skip to content

Commit

Permalink
Merge #1133
Browse files Browse the repository at this point in the history
1133: Remove unused CentOS file for x86_64. r=Emilgardis a=Alexhuszagh



Co-authored-by: Alex Huszagh <[email protected]>
  • Loading branch information
bors[bot] and Alexhuszagh authored Nov 14, 2022
2 parents 5108b9f + ae89707 commit 8108f90
Showing 1 changed file with 2 additions and 30 deletions.
32 changes: 2 additions & 30 deletions docker/Dockerfile.x86_64-unknown-linux-gnu.centos
Original file line number Diff line number Diff line change
@@ -1,31 +1,3 @@
# HACK: this file is currently never used and only exists for usage with `Dockerfile.native.centos`
# it will be supported for aarch64 hosts, see #751 and #975
FROM ubuntu:20.04
ARG DEBIAN_FRONTEND=noninteractive

COPY lib.sh /
COPY linux-image.sh /
RUN /linux-image.sh x86_64

FROM centos:7

COPY common.sh lib.sh /
RUN /common.sh

COPY cmake.sh /
RUN /cmake.sh

COPY xargo.sh /
RUN /xargo.sh

COPY qemu.sh /
RUN /qemu.sh x86_64 softmmu

COPY dropbear.sh /
RUN /dropbear.sh

COPY --from=0 /qemu /qemu

COPY linux-runner base-runner.sh /

ENV CROSS_TOOLCHAIN_PREFIX=
ENV CROSS_SYSROOT=/
ENV CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUNNER="/linux-runner x86_64"

0 comments on commit 8108f90

Please sign in to comment.