M-Labs
/
compiler-builtins-zynq
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix apt 404s in Docker 

`apt update` and `apt install` should be in the same Docker RUN statement, otherwise `apt update` will be cached and `apt install` will 404 if a package no longer exists.
This commit is contained in:
Matt Ickstadt 2016-11-12 15:09:47 -06:00
parent 33dc132dd5
commit 2a8cca03d8
18 changed files with 65 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ci/docker/aarch64-unknown-linux-gnu/Dockerfile
View File

@ -1,6 +1,6 @@
FROM ubuntu:16.04 FROM ubuntu:16.04
RUN apt-get update RUN apt-get update && \
RUN apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
gcc libc6-dev ca-certificates \ gcc libc6-dev ca-certificates \
gcc-aarch64-linux-gnu libc6-dev-arm64-cross \ gcc-aarch64-linux-gnu libc6-dev-arm64-cross \
qemu-user-static qemu-user-static

4
ci/docker/arm-unknown-linux-gnueabi/Dockerfile
View File

@ -1,6 +1,6 @@
FROM ubuntu:16.04 FROM ubuntu:16.04
RUN apt-get update RUN apt-get update && \
RUN apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
gcc libc6-dev ca-certificates \ gcc libc6-dev ca-certificates \
gcc-arm-linux-gnueabi libc6-dev-armel-cross qemu-user-static gcc-arm-linux-gnueabi libc6-dev-armel-cross qemu-user-static
ENV CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABI_LINKER=arm-linux-gnueabi-gcc \ ENV CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABI_LINKER=arm-linux-gnueabi-gcc \

4
ci/docker/arm-unknown-linux-gnueabihf/Dockerfile
View File

@ -1,6 +1,6 @@
FROM ubuntu:16.04 FROM ubuntu:16.04
RUN apt-get update RUN apt-get update && \
RUN apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
gcc libc6-dev ca-certificates \ gcc libc6-dev ca-certificates \
gcc-arm-linux-gnueabihf libc6-dev-armhf-cross qemu-user-static gcc-arm-linux-gnueabihf libc6-dev-armhf-cross qemu-user-static
ENV CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-linux-gnueabihf-gcc \ ENV CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-linux-gnueabihf-gcc \

4
ci/docker/armv7-unknown-linux-gnueabihf/Dockerfile
View File

@ -1,6 +1,6 @@
FROM ubuntu:16.04 FROM ubuntu:16.04
RUN apt-get update RUN apt-get update && \
RUN apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
gcc libc6-dev ca-certificates \ gcc libc6-dev ca-certificates \
gcc-arm-linux-gnueabihf libc6-dev-armhf-cross qemu-user-static gcc-arm-linux-gnueabihf libc6-dev-armhf-cross qemu-user-static
ENV CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-linux-gnueabihf-gcc \ ENV CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-linux-gnueabihf-gcc \

4
ci/docker/i586-unknown-linux-gnu/Dockerfile
View File

@ -1,4 +1,4 @@
FROM ubuntu:16.04 FROM ubuntu:16.04
RUN apt-get update RUN apt-get update && \
RUN apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
gcc-multilib libc6-dev ca-certificates gcc-multilib libc6-dev ca-certificates

4
ci/docker/i686-unknown-linux-gnu/Dockerfile
View File

@ -1,4 +1,4 @@
FROM ubuntu:16.04 FROM ubuntu:16.04
RUN apt-get update RUN apt-get update && \
RUN apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
gcc-multilib libc6-dev ca-certificates gcc-multilib libc6-dev ca-certificates

4
ci/docker/mips-unknown-linux-gnu/Dockerfile
View File

@ -1,7 +1,7 @@
FROM ubuntu:16.04 FROM ubuntu:16.04
RUN apt-get update RUN apt-get update && \
RUN apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
gcc libc6-dev ca-certificates \ gcc libc6-dev ca-certificates \
gcc-mips-linux-gnu libc6-dev-mips-cross \ gcc-mips-linux-gnu libc6-dev-mips-cross \
binfmt-support qemu-user-static qemu-system-mips binfmt-support qemu-user-static qemu-system-mips

8
ci/docker/mips64-unknown-linux-gnuabi64/Dockerfile
View File

@ -1,13 +1,13 @@
FROM ubuntu:16.04 FROM ubuntu:16.04
RUN apt-get update RUN apt-get update && \
RUN apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
ca-certificates \ ca-certificates \
gcc \ gcc \
gcc-mips64-linux-gnuabi64 \ gcc-mips64-linux-gnuabi64 \
libc6-dev \ libc6-dev \
libc6-dev-mips64-cross \ libc6-dev-mips64-cross \
qemu-user-static qemu-user-static \
RUN apt-get install -y --no-install-recommends qemu-system-mips apt-get install -y --no-install-recommends qemu-system-mips
ENV CARGO_TARGET_MIPS64_UNKNOWN_LINUX_GNUABI64_LINKER=mips64-linux-gnuabi64-gcc \ ENV CARGO_TARGET_MIPS64_UNKNOWN_LINUX_GNUABI64_LINKER=mips64-linux-gnuabi64-gcc \
CC_mips64_unknown_linux_gnuabi64=mips64-linux-gnuabi64-gcc \ CC_mips64_unknown_linux_gnuabi64=mips64-linux-gnuabi64-gcc \
QEMU_LD_PREFIX=/usr/mips64-linux-gnuabi64 \ QEMU_LD_PREFIX=/usr/mips64-linux-gnuabi64 \

4
ci/docker/mips64el-unknown-linux-gnuabi64/Dockerfile
View File

@ -1,6 +1,6 @@
FROM ubuntu:16.04 FROM ubuntu:16.04
RUN apt-get update RUN apt-get update && \
RUN apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
ca-certificates \ ca-certificates \
gcc \ gcc \
gcc-mips64el-linux-gnuabi64 \ gcc-mips64el-linux-gnuabi64 \

4
ci/docker/mipsel-unknown-linux-gnu/Dockerfile
View File

@ -1,7 +1,7 @@
FROM ubuntu:16.04 FROM ubuntu:16.04
RUN apt-get update RUN apt-get update && \
RUN apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
gcc libc6-dev ca-certificates \ gcc libc6-dev ca-certificates \
gcc-mipsel-linux-gnu libc6-dev-mipsel-cross \ gcc-mipsel-linux-gnu libc6-dev-mipsel-cross \
binfmt-support qemu-user-static binfmt-support qemu-user-static

4
ci/docker/powerpc-unknown-linux-gnu/Dockerfile
View File

@ -1,7 +1,7 @@
FROM ubuntu:16.04 FROM ubuntu:16.04
RUN apt-get update RUN apt-get update && \
RUN apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
gcc libc6-dev qemu-user-static ca-certificates \ gcc libc6-dev qemu-user-static ca-certificates \
gcc-powerpc-linux-gnu libc6-dev-powerpc-cross \ gcc-powerpc-linux-gnu libc6-dev-powerpc-cross \
qemu-system-ppc qemu-system-ppc

4
ci/docker/powerpc64-unknown-linux-gnu/Dockerfile
View File

@ -1,7 +1,7 @@
FROM ubuntu:16.04 FROM ubuntu:16.04
RUN apt-get update RUN apt-get update && \
RUN apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
gcc libc6-dev ca-certificates \ gcc libc6-dev ca-certificates \
gcc-powerpc64-linux-gnu libc6-dev-ppc64-cross \ gcc-powerpc64-linux-gnu libc6-dev-ppc64-cross \
binfmt-support qemu-user-static qemu-system-ppc binfmt-support qemu-user-static qemu-system-ppc

4
ci/docker/powerpc64le-unknown-linux-gnu/Dockerfile
View File

@ -1,7 +1,7 @@
FROM ubuntu:16.04 FROM ubuntu:16.04
RUN apt-get update RUN apt-get update && \
RUN apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
gcc libc6-dev qemu-user-static ca-certificates \ gcc libc6-dev qemu-user-static ca-certificates \
gcc-powerpc64le-linux-gnu libc6-dev-ppc64el-cross \ gcc-powerpc64le-linux-gnu libc6-dev-ppc64el-cross \
qemu-system-ppc qemu-system-ppc

4
ci/docker/thumbv6m-none-eabi/Dockerfile
View File

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

4
ci/docker/thumbv7em-none-eabi/Dockerfile
View File

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

4
ci/docker/thumbv7em-none-eabihf/Dockerfile
View File

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

4
ci/docker/thumbv7m-none-eabi/Dockerfile
View File

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

4
ci/docker/x86_64-unknown-linux-gnu/Dockerfile
View File

@ -1,4 +1,4 @@
FROM ubuntu:16.04 FROM ubuntu:16.04
RUN apt-get update RUN apt-get update && \
RUN apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
gcc libc6-dev ca-certificates gcc libc6-dev ca-certificates