Skip to content

Commit a7460e2

Browse files
authored
Merge pull request #1815 from lzutao/rustc-docker
ci: Use rustc docker image for x86_64 and i686 linux
2 parents d39570f + 05632bf commit a7460e2

File tree

3 files changed

+4
-18
lines changed

3 files changed

+4
-18
lines changed
+1-9
Original file line numberDiff line numberDiff line change
@@ -1,9 +1 @@
1-
FROM alexcrichton/rust-slave-dist:2015-10-20b
2-
USER root
3-
4-
WORKDIR /
5-
RUN curl https://www.cpan.org/src/5.0/perl-5.28.0.tar.gz | tar xzf -
6-
WORKDIR /perl-5.28.0
7-
RUN ./configure.gnu
8-
RUN make -j$(nproc)
9-
RUN make install
1+
FROM rust-i686-unknown-linux-gnu
Original file line numberDiff line numberDiff line change
@@ -1,9 +1 @@
1-
FROM alexcrichton/rust-slave-dist:2015-10-20b
2-
USER root
3-
4-
WORKDIR /
5-
RUN curl https://www.cpan.org/src/5.0/perl-5.28.0.tar.gz | tar xzf -
6-
WORKDIR /perl-5.28.0
7-
RUN ./configure.gnu
8-
RUN make -j$(nproc)
9-
RUN make install
1+
FROM rust-x86_64-unknown-linux-gnu

ci/fetch-rust-docker.sh

+2
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ case "$TARGET" in
2222
powerpc64-unknown-linux-gnu) image=dist-powerpc64-linux ;;
2323
powerpc64le-unknown-linux-gnu) image=dist-powerpc64le-linux ;;
2424
s390x-unknown-linux-gnu) image=dist-s390x-linux ;;
25+
x86_64-unknown-linux-gnu) image=dist-x86_64-linux ;;
26+
i686-unknown-linux-gnu) image=dist-i686-linux ;;
2527
*) exit ;;
2628
esac
2729

0 commit comments

Comments
 (0)