Skip to content

Commit ab0693d

Browse files
author
Jorge Aparicio
authored
Merge pull request rust-lang#117 from mattico/fix-docker-apt-404
Fix apt 404s in Docker
2 parents 8992316 + e2fc5a0 commit ab0693d

File tree

18 files changed

+65
-65
lines changed

18 files changed

+65
-65
lines changed

‎ci/docker/aarch64-unknown-linux-gnu/Dockerfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
FROM ubuntu:16.04
2-
RUN apt-get update
3-
RUN apt-get install -y --no-install-recommends \
4-
gcc libc6-dev ca-certificates \
5-
gcc-aarch64-linux-gnu libc6-dev-arm64-cross \
6-
qemu-user-static
2+
RUN apt-get update && \
3+
apt-get install -y --no-install-recommends \
4+
gcc libc6-dev ca-certificates \
5+
gcc-aarch64-linux-gnu libc6-dev-arm64-cross \
6+
qemu-user-static
77
ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc \
88
QEMU_LD_PREFIX=/usr/aarch64-linux-gnu \
99
RUST_TEST_THREADS=1

‎ci/docker/arm-unknown-linux-gnueabi/Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
FROM ubuntu:16.04
2-
RUN apt-get update
3-
RUN apt-get install -y --no-install-recommends \
4-
gcc libc6-dev ca-certificates \
5-
gcc-arm-linux-gnueabi libc6-dev-armel-cross qemu-user-static
2+
RUN apt-get update && \
3+
apt-get install -y --no-install-recommends \
4+
gcc libc6-dev ca-certificates \
5+
gcc-arm-linux-gnueabi libc6-dev-armel-cross qemu-user-static
66
ENV CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABI_LINKER=arm-linux-gnueabi-gcc \
77
QEMU_LD_PREFIX=/usr/arm-linux-gnueabi \
88
RUST_TEST_THREADS=1

‎ci/docker/arm-unknown-linux-gnueabihf/Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
FROM ubuntu:16.04
2-
RUN apt-get update
3-
RUN apt-get install -y --no-install-recommends \
4-
gcc libc6-dev ca-certificates \
5-
gcc-arm-linux-gnueabihf libc6-dev-armhf-cross qemu-user-static
2+
RUN apt-get update && \
3+
apt-get install -y --no-install-recommends \
4+
gcc libc6-dev ca-certificates \
5+
gcc-arm-linux-gnueabihf libc6-dev-armhf-cross qemu-user-static
66
ENV CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-linux-gnueabihf-gcc \
77
QEMU_LD_PREFIX=/usr/arm-linux-gnueabihf \
88
RUST_TEST_THREADS=1

‎ci/docker/armv7-unknown-linux-gnueabihf/Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
FROM ubuntu:16.04
2-
RUN apt-get update
3-
RUN apt-get install -y --no-install-recommends \
4-
gcc libc6-dev ca-certificates \
5-
gcc-arm-linux-gnueabihf libc6-dev-armhf-cross qemu-user-static
2+
RUN apt-get update && \
3+
apt-get install -y --no-install-recommends \
4+
gcc libc6-dev ca-certificates \
5+
gcc-arm-linux-gnueabihf libc6-dev-armhf-cross qemu-user-static
66
ENV CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-linux-gnueabihf-gcc \
77
QEMU_LD_PREFIX=/usr/arm-linux-gnueabihf \
88
RUST_TEST_THREADS=1

‎ci/docker/i586-unknown-linux-gnu/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
FROM ubuntu:16.04
2-
RUN apt-get update
3-
RUN apt-get install -y --no-install-recommends \
4-
gcc-multilib libc6-dev ca-certificates
2+
RUN apt-get update && \
3+
apt-get install -y --no-install-recommends \
4+
gcc-multilib libc6-dev ca-certificates

‎ci/docker/i686-unknown-linux-gnu/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
FROM ubuntu:16.04
2-
RUN apt-get update
3-
RUN apt-get install -y --no-install-recommends \
4-
gcc-multilib libc6-dev ca-certificates
2+
RUN apt-get update && \
3+
apt-get install -y --no-install-recommends \
4+
gcc-multilib libc6-dev ca-certificates

‎ci/docker/mips-unknown-linux-gnu/Dockerfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
FROM ubuntu:16.04
22

3-
RUN apt-get update
4-
RUN apt-get install -y --no-install-recommends \
5-
gcc libc6-dev ca-certificates \
6-
gcc-mips-linux-gnu libc6-dev-mips-cross \
7-
binfmt-support qemu-user-static qemu-system-mips
3+
RUN apt-get update && \
4+
apt-get install -y --no-install-recommends \
5+
gcc libc6-dev ca-certificates \
6+
gcc-mips-linux-gnu libc6-dev-mips-cross \
7+
binfmt-support qemu-user-static qemu-system-mips
88

99
ENV CARGO_TARGET_MIPS_UNKNOWN_LINUX_GNU_LINKER=mips-linux-gnu-gcc \
1010
QEMU_LD_PREFIX=/usr/mips-linux-gnu \

‎ci/docker/mips64-unknown-linux-gnuabi64/Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
FROM ubuntu:16.04
2-
RUN apt-get update
3-
RUN apt-get install -y --no-install-recommends \
2+
RUN apt-get update && \
3+
apt-get install -y --no-install-recommends \
44
ca-certificates \
55
gcc \
66
gcc-mips64-linux-gnuabi64 \
77
libc6-dev \
88
libc6-dev-mips64-cross \
9-
qemu-user-static
10-
RUN apt-get install -y --no-install-recommends qemu-system-mips
9+
qemu-user-static \
10+
qemu-system-mips
1111
ENV CARGO_TARGET_MIPS64_UNKNOWN_LINUX_GNUABI64_LINKER=mips64-linux-gnuabi64-gcc \
1212
CC_mips64_unknown_linux_gnuabi64=mips64-linux-gnuabi64-gcc \
1313
QEMU_LD_PREFIX=/usr/mips64-linux-gnuabi64 \

‎ci/docker/mips64el-unknown-linux-gnuabi64/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM ubuntu:16.04
2-
RUN apt-get update
3-
RUN apt-get install -y --no-install-recommends \
2+
RUN apt-get update && \
3+
apt-get install -y --no-install-recommends \
44
ca-certificates \
55
gcc \
66
gcc-mips64el-linux-gnuabi64 \

‎ci/docker/mipsel-unknown-linux-gnu/Dockerfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
FROM ubuntu:16.04
22

3-
RUN apt-get update
4-
RUN apt-get install -y --no-install-recommends \
5-
gcc libc6-dev ca-certificates \
6-
gcc-mipsel-linux-gnu libc6-dev-mipsel-cross \
7-
binfmt-support qemu-user-static
3+
RUN apt-get update && \
4+
apt-get install -y --no-install-recommends \
5+
gcc libc6-dev ca-certificates \
6+
gcc-mipsel-linux-gnu libc6-dev-mipsel-cross \
7+
binfmt-support qemu-user-static
88

99
ENV CARGO_TARGET_MIPSEL_UNKNOWN_LINUX_GNU_LINKER=mipsel-linux-gnu-gcc \
1010
QEMU_LD_PREFIX=/usr/mipsel-linux-gnu \

‎ci/docker/powerpc-unknown-linux-gnu/Dockerfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
FROM ubuntu:16.04
22

3-
RUN apt-get update
4-
RUN apt-get install -y --no-install-recommends \
5-
gcc libc6-dev qemu-user-static ca-certificates \
6-
gcc-powerpc-linux-gnu libc6-dev-powerpc-cross \
7-
qemu-system-ppc
3+
RUN apt-get update && \
4+
apt-get install -y --no-install-recommends \
5+
gcc libc6-dev qemu-user-static ca-certificates \
6+
gcc-powerpc-linux-gnu libc6-dev-powerpc-cross \
7+
qemu-system-ppc
88

99
ENV CARGO_TARGET_POWERPC_UNKNOWN_LINUX_GNU_LINKER=powerpc-linux-gnu-gcc \
1010
QEMU_LD_PREFIX=/usr/powerpc-linux-gnu \

‎ci/docker/powerpc64-unknown-linux-gnu/Dockerfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
FROM ubuntu:16.04
22

3-
RUN apt-get update
4-
RUN apt-get install -y --no-install-recommends \
5-
gcc libc6-dev ca-certificates \
6-
gcc-powerpc64-linux-gnu libc6-dev-ppc64-cross \
7-
binfmt-support qemu-user-static qemu-system-ppc
3+
RUN apt-get update && \
4+
apt-get install -y --no-install-recommends \
5+
gcc libc6-dev ca-certificates \
6+
gcc-powerpc64-linux-gnu libc6-dev-ppc64-cross \
7+
binfmt-support qemu-user-static qemu-system-ppc
88

99
ENV CARGO_TARGET_POWERPC64_UNKNOWN_LINUX_GNU_LINKER=powerpc64-linux-gnu-gcc \
1010
CC_powerpc64_unknown_linux_gnu=powerpc64-linux-gnu-gcc \

‎ci/docker/powerpc64le-unknown-linux-gnu/Dockerfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
FROM ubuntu:16.04
22

3-
RUN apt-get update
4-
RUN apt-get install -y --no-install-recommends \
5-
gcc libc6-dev qemu-user-static ca-certificates \
6-
gcc-powerpc64le-linux-gnu libc6-dev-ppc64el-cross \
7-
qemu-system-ppc
3+
RUN apt-get update && \
4+
apt-get install -y --no-install-recommends \
5+
gcc libc6-dev qemu-user-static ca-certificates \
6+
gcc-powerpc64le-linux-gnu libc6-dev-ppc64el-cross \
7+
qemu-system-ppc
88

99
ENV CARGO_TARGET_POWERPC64LE_UNKNOWN_LINUX_GNU_LINKER=powerpc64le-linux-gnu-gcc \
1010
QEMU_CPU=POWER8 \

‎ci/docker/thumbv6m-none-eabi/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM ubuntu:16.04
2-
RUN apt-get update
3-
RUN apt-get install -y --no-install-recommends \
2+
RUN apt-get update && \
3+
apt-get install -y --no-install-recommends \
44
ca-certificates curl gcc gcc-arm-none-eabi libc6-dev libcurl4-openssl-dev libssh2-1 libnewlib-dev
55
RUN curl -sf "https://raw.githubusercontent.com/japaric/rust-everywhere/master/install.sh" | \
66
bash -s -- --at /usr/bin --from japaric/xargo --for x86_64-unknown-linux-gnu --tag v0.1.13

‎ci/docker/thumbv7em-none-eabi/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM ubuntu:16.04
2-
RUN apt-get update
3-
RUN apt-get install -y --no-install-recommends \
2+
RUN apt-get update && \
3+
apt-get install -y --no-install-recommends \
44
ca-certificates curl gcc gcc-arm-none-eabi libc6-dev libcurl4-openssl-dev libssh2-1 libnewlib-dev
55
RUN curl -sf "https://raw.githubusercontent.com/japaric/rust-everywhere/master/install.sh" | \
66
bash -s -- --at /usr/bin --from japaric/xargo --for x86_64-unknown-linux-gnu --tag v0.1.13

‎ci/docker/thumbv7em-none-eabihf/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM ubuntu:16.04
2-
RUN apt-get update
3-
RUN apt-get install -y --no-install-recommends \
2+
RUN apt-get update && \
3+
apt-get install -y --no-install-recommends \
44
ca-certificates curl gcc gcc-arm-none-eabi libc6-dev libcurl4-openssl-dev libssh2-1 libnewlib-dev
55
RUN curl -sf "https://raw.githubusercontent.com/japaric/rust-everywhere/master/install.sh" | \
66
bash -s -- --at /usr/bin --from japaric/xargo --for x86_64-unknown-linux-gnu --tag v0.1.13

‎ci/docker/thumbv7m-none-eabi/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM ubuntu:16.04
2-
RUN apt-get update
3-
RUN apt-get install -y --no-install-recommends \
2+
RUN apt-get update && \
3+
apt-get install -y --no-install-recommends \
44
ca-certificates curl gcc gcc-arm-none-eabi libc6-dev libcurl4-openssl-dev libssh2-1 libnewlib-dev
55
RUN curl -sf "https://raw.githubusercontent.com/japaric/rust-everywhere/master/install.sh" | \
66
bash -s -- --at /usr/bin --from japaric/xargo --for x86_64-unknown-linux-gnu --tag v0.1.13

‎ci/docker/x86_64-unknown-linux-gnu/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
FROM ubuntu:16.04
2-
RUN apt-get update
3-
RUN apt-get install -y --no-install-recommends \
4-
gcc libc6-dev ca-certificates
2+
RUN apt-get update && \
3+
apt-get install -y --no-install-recommends \
4+
gcc libc6-dev ca-certificates

0 commit comments

Comments
 (0)