Skip to content

Commit

Permalink
Merge #592
Browse files Browse the repository at this point in the history 
592: Ensure apt-get update is run during Docker builds. r=reitermarkus a=Alexhuszagh

Fixed #590, by preventing caching of layers which can prevent builds
from completing when a step fails, causing the package repository to
become out-of-date and the install step to fail.

Co-authored-by: Alex Huszagh <ahuszagh@gmail.com>
  • Loading branch information
@bors @Alexhuszagh
bors[bot] and Alexhuszagh committed Mar 17, 2022
2 parents 4ad6347 + 9622f33 commit 762f0f0
Show file tree
Hide file tree
Showing 21 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion docker/Dockerfile.aarch64-unknown-linux-gnu
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RUN /cmake.sh
COPY xargo.sh /
RUN /xargo.sh

RUN apt-get install --assume-yes --no-install-recommends \
RUN apt-get update && apt-get install --assume-yes --no-install-recommends \
g++-aarch64-linux-gnu \
libc6-dev-arm64-cross

Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.arm-unknown-linux-gnueabi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ COPY xargo.sh /
RUN /xargo.sh

COPY qemu.sh /
RUN apt-get install --assume-yes --no-install-recommends \
RUN apt-get update && apt-get install --assume-yes --no-install-recommends \
g++-arm-linux-gnueabi \
libc6-dev-armel-cross && \
/qemu.sh arm
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.armv5te-unknown-linux-gnueabi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ COPY xargo.sh /
RUN /xargo.sh

COPY qemu.sh /
RUN apt-get install --assume-yes --no-install-recommends \
RUN apt-get update && apt-get install --assume-yes --no-install-recommends \
g++-arm-linux-gnueabi \
crossbuild-essential-armel \
libc6-dev-armel-cross && \
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.armv7-unknown-linux-gnueabihf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RUN /cmake.sh
COPY xargo.sh /
RUN /xargo.sh

RUN apt-get install --assume-yes --no-install-recommends \
RUN apt-get update && apt-get install --assume-yes --no-install-recommends \
g++-arm-linux-gnueabihf \
libc6-dev-armhf-cross

Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.asmjs-unknown-emscripten
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ ENV PATH="${EMSDK}:${EMSDK}/emscripten/sdk:${EMSDK}/llvm/clang/bin:${EMSDK}/node

ENTRYPOINT ["/emsdk_portable/entrypoint"]

RUN apt-get update && apt-get install --assume-yes --no-install-recommends \
RUN apt-get update && apt-get update && apt-get install --assume-yes --no-install-recommends \
libxml2 \
python

Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.i586-unknown-linux-gnu
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ RUN /cmake.sh
COPY xargo.sh /
RUN /xargo.sh

RUN apt-get install --assume-yes --no-install-recommends \
RUN apt-get update && apt-get install --assume-yes --no-install-recommends \
g++-multilib
2 changes: 1 addition & 1 deletion docker/Dockerfile.i686-unknown-linux-gnu
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RUN /cmake.sh
COPY xargo.sh /
RUN /xargo.sh

RUN apt-get install --assume-yes --no-install-recommends \
RUN apt-get update && apt-get install --assume-yes --no-install-recommends \
g++-multilib

COPY qemu.sh /
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.mips64-unknown-linux-gnuabi64
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ COPY xargo.sh /
RUN /xargo.sh

COPY qemu.sh /
RUN apt-get install --assume-yes --no-install-recommends \
RUN apt-get update && apt-get install --assume-yes --no-install-recommends \
g++-mips64-linux-gnuabi64 \
libc6-dev-mips64-cross && \
/qemu.sh mips64
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.mips64el-unknown-linux-gnuabi64
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RUN /cmake.sh
COPY xargo.sh /
RUN /xargo.sh

RUN apt-get install --assume-yes --no-install-recommends \
RUN apt-get update && apt-get install --assume-yes --no-install-recommends \
g++-mips64el-linux-gnuabi64 \
libc6-dev-mips64el-cross

Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.mipsel-unknown-linux-gnu
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RUN /cmake.sh
COPY xargo.sh /
RUN /xargo.sh

RUN apt-get install --assume-yes --no-install-recommends \
RUN apt-get update && apt-get install --assume-yes --no-install-recommends \
g++-mipsel-linux-gnu \
libc6-dev-mipsel-cross

Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.powerpc-unknown-linux-gnu
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RUN /cmake.sh
COPY xargo.sh /
RUN /xargo.sh

RUN apt-get install --assume-yes --no-install-recommends \
RUN apt-get update && apt-get install --assume-yes --no-install-recommends \
g++-powerpc-linux-gnu \
libc6-dev-powerpc-cross

Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.powerpc64-unknown-linux-gnu
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RUN /cmake.sh
COPY xargo.sh /
RUN /xargo.sh

RUN apt-get install --assume-yes --no-install-recommends \
RUN apt-get update && apt-get install --assume-yes --no-install-recommends \
g++-powerpc64-linux-gnu \
libc6-dev-ppc64-cross

Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.powerpc64le-unknown-linux-gnu
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RUN /cmake.sh
COPY xargo.sh /
RUN /xargo.sh

RUN apt-get install --assume-yes --no-install-recommends \
RUN apt-get update && apt-get install --assume-yes --no-install-recommends \
g++-powerpc64le-linux-gnu \
libc6-dev-ppc64el-cross

Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.riscv64gc-unknown-linux-gnu
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RUN /common.sh
COPY xargo.sh /
RUN /xargo.sh

RUN apt-get install -y --no-install-recommends \
RUN apt-get update && apt-get install -y --no-install-recommends \
g++-riscv64-linux-gnu \
libc6-dev-riscv64-cross

Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.s390x-unknown-linux-gnu
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RUN /cmake.sh
COPY xargo.sh /
RUN /xargo.sh

RUN apt-get install --assume-yes --no-install-recommends \
RUN apt-get update && apt-get install --assume-yes --no-install-recommends \
g++-s390x-linux-gnu \
libc6-dev-s390x-cross

Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.sparc64-unknown-linux-gnu
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RUN /cmake.sh
COPY xargo.sh /
RUN /xargo.sh

RUN apt-get install --assume-yes --no-install-recommends \
RUN apt-get update && apt-get install --assume-yes --no-install-recommends \
g++-sparc64-linux-gnu \
libc6-dev-sparc64-cross

Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.thumbv6m-none-eabi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ COPY xargo.sh /
RUN /xargo.sh

COPY qemu.sh /
RUN apt-get install --assume-yes --no-install-recommends \
RUN apt-get update && apt-get install --assume-yes --no-install-recommends \
gcc-arm-none-eabi \
libnewlib-arm-none-eabi && \
/qemu.sh arm
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.thumbv7em-none-eabi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ COPY xargo.sh /
RUN /xargo.sh

COPY qemu.sh /
RUN apt-get install --assume-yes --no-install-recommends \
RUN apt-get update && apt-get install --assume-yes --no-install-recommends \
gcc-arm-none-eabi \
libnewlib-arm-none-eabi && \
/qemu.sh arm
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.thumbv7em-none-eabihf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ COPY xargo.sh /
RUN /xargo.sh

COPY qemu.sh /
RUN apt-get install --assume-yes --no-install-recommends \
RUN apt-get update && apt-get install --assume-yes --no-install-recommends \
gcc-arm-none-eabi \
libnewlib-arm-none-eabi && \
/qemu.sh arm
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.thumbv7m-none-eabi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ COPY xargo.sh /
RUN /xargo.sh

COPY qemu.sh /
RUN apt-get install --assume-yes --no-install-recommends \
RUN apt-get update && apt-get install --assume-yes --no-install-recommends \
gcc-arm-none-eabi \
libnewlib-arm-none-eabi && \
/qemu.sh arm
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.x86_64-pc-windows-gnu
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ RUN dpkg --add-architecture i386 && apt-get update && \
wine32 \
libz-mingw-w64-dev

RUN apt-get install --assume-yes --no-install-recommends g++-mingw-w64-x86-64
RUN apt-get update && apt-get install --assume-yes --no-install-recommends g++-mingw-w64-x86-64

# run-detectors are responsible for calling the correct interpreter for exe
# files. For some reason it does not work inside a docker container (it works
Expand Down

0 comments on commit 762f0f0

Please sign in to comment.