Skip to content

Commit

Permalink
Merge #593 #688
Browse files Browse the repository at this point in the history 
593: Ensure build steps use non-interactive package installs. r=Emilgardis a=Alexhuszagh

Fixes #589. Some libraries, such as `tzdata`, can ask for user input
during installation, which is problematic when building a Docker image,
since it prevents automatation and stdin i typically not attached. This
has also been an issue upgrading Docker images to the latest Ubuntu
versions.

688: Bump `cmake` to version `3.23.1` r=Emilgardis a=Jules-Bertholet



Co-authored-by: Alex Huszagh <ahuszagh@gmail.com>
Co-authored-by: Jules Bertholet <jules.bertholet@gmail.com>
  • Loading branch information
@bors @Alexhuszagh @Jules-Bertholet
3 people committed Apr 22, 2022
3 parents 3a5210c + eab33d6 + fb89f77 commit 13a1bb0
Show file tree
Hide file tree
Showing 48 changed files with 49 additions and 2 deletions.
1 change: 1 addition & 0 deletions docker/Dockerfile.aarch64-linux-android
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM ubuntu:20.04
ARG DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
RUN /common.sh
Expand Down
1 change: 1 addition & 0 deletions docker/Dockerfile.aarch64-unknown-linux-gnu
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM ubuntu:16.04
ARG DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
RUN /common.sh
Expand Down
1 change: 1 addition & 0 deletions docker/Dockerfile.aarch64-unknown-linux-musl
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM ubuntu:18.04
ARG DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
RUN /common.sh
Expand Down
1 change: 1 addition & 0 deletions docker/Dockerfile.arm-linux-androideabi
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM ubuntu:20.04
ARG DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
RUN /common.sh
Expand Down
1 change: 1 addition & 0 deletions docker/Dockerfile.arm-unknown-linux-gnueabi
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM ubuntu:16.04
ARG DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
RUN /common.sh
Expand Down
1 change: 1 addition & 0 deletions docker/Dockerfile.arm-unknown-linux-gnueabihf
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM ubuntu:18.04
ARG DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
RUN /common.sh
Expand Down
1 change: 1 addition & 0 deletions docker/Dockerfile.arm-unknown-linux-musleabi
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM ubuntu:18.04
ARG DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
RUN /common.sh
Expand Down
1 change: 1 addition & 0 deletions docker/Dockerfile.arm-unknown-linux-musleabihf
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM ubuntu:18.04
ARG DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
RUN /common.sh
Expand Down
1 change: 1 addition & 0 deletions docker/Dockerfile.armv5te-unknown-linux-gnueabi
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM ubuntu:18.04
ARG DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
RUN /common.sh
Expand Down
1 change: 1 addition & 0 deletions docker/Dockerfile.armv5te-unknown-linux-musleabi
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM ubuntu:18.04
ARG DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
RUN /common.sh
Expand Down
1 change: 1 addition & 0 deletions docker/Dockerfile.armv7-linux-androideabi
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM ubuntu:20.04
ARG DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
RUN /common.sh
Expand Down
1 change: 1 addition & 0 deletions docker/Dockerfile.armv7-unknown-linux-gnueabihf
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM ubuntu:16.04
ARG DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
RUN /common.sh
Expand Down
1 change: 1 addition & 0 deletions docker/Dockerfile.armv7-unknown-linux-musleabihf
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM ubuntu:20.04
ARG DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
RUN /common.sh
Expand Down
1 change: 1 addition & 0 deletions docker/Dockerfile.asmjs-unknown-emscripten
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM ubuntu:16.04
ARG DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
RUN /common.sh
Expand Down
1 change: 1 addition & 0 deletions docker/Dockerfile.i586-unknown-linux-gnu
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM ubuntu:16.04
ARG DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
RUN /common.sh
Expand Down
1 change: 1 addition & 0 deletions docker/Dockerfile.i586-unknown-linux-musl
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM ubuntu:18.04
ARG DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
RUN /common.sh
Expand Down
1 change: 1 addition & 0 deletions docker/Dockerfile.i686-linux-android
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM ubuntu:20.04
ARG DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
RUN /common.sh
Expand Down
1 change: 1 addition & 0 deletions docker/Dockerfile.i686-pc-windows-gnu
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM ubuntu:18.04
ARG DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
RUN /common.sh
Expand Down
1 change: 1 addition & 0 deletions docker/Dockerfile.i686-unknown-freebsd
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM ubuntu:16.04
ARG DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
RUN /common.sh
Expand Down
1 change: 1 addition & 0 deletions docker/Dockerfile.i686-unknown-linux-gnu
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM ubuntu:16.04
ARG DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
RUN /common.sh
Expand Down
1 change: 1 addition & 0 deletions docker/Dockerfile.i686-unknown-linux-musl
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM ubuntu:18.04
ARG DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
RUN /common.sh
Expand Down
1 change: 1 addition & 0 deletions docker/Dockerfile.mips-unknown-linux-gnu
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM ubuntu:16.04
ARG DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
RUN /common.sh
Expand Down
1 change: 1 addition & 0 deletions docker/Dockerfile.mips-unknown-linux-musl
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM ubuntu:18.04
ARG DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
RUN /common.sh
Expand Down
1 change: 1 addition & 0 deletions docker/Dockerfile.mips64-unknown-linux-gnuabi64
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM ubuntu:16.04
ARG DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
RUN /common.sh
Expand Down
1 change: 1 addition & 0 deletions docker/Dockerfile.mips64el-unknown-linux-gnuabi64
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM ubuntu:16.04
ARG DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
RUN /common.sh
Expand Down
1 change: 1 addition & 0 deletions docker/Dockerfile.mipsel-unknown-linux-gnu
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM ubuntu:16.04
ARG DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
RUN /common.sh
Expand Down
1 change: 1 addition & 0 deletions docker/Dockerfile.mipsel-unknown-linux-musl
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM ubuntu:18.04
ARG DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
RUN /common.sh
Expand Down
1 change: 1 addition & 0 deletions docker/Dockerfile.powerpc-unknown-linux-gnu
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM ubuntu:16.04
ARG DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
RUN /common.sh
Expand Down
1 change: 1 addition & 0 deletions docker/Dockerfile.powerpc64-unknown-linux-gnu
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM ubuntu:16.04
ARG DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
RUN /common.sh
Expand Down
1 change: 1 addition & 0 deletions docker/Dockerfile.powerpc64le-unknown-linux-gnu
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM ubuntu:16.04
ARG DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
RUN /common.sh
Expand Down
1 change: 1 addition & 0 deletions docker/Dockerfile.riscv64gc-unknown-linux-gnu
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM ubuntu:18.04
ARG DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
RUN /common.sh
Expand Down
1 change: 1 addition & 0 deletions docker/Dockerfile.s390x-unknown-linux-gnu
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM ubuntu:16.04
ARG DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
RUN /common.sh
Expand Down
1 change: 1 addition & 0 deletions docker/Dockerfile.sparc64-unknown-linux-gnu
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM ubuntu:16.04
ARG DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
RUN /common.sh
Expand Down
1 change: 1 addition & 0 deletions docker/Dockerfile.sparcv9-sun-solaris
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM ubuntu:16.04
ARG DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
RUN /common.sh
Expand Down
1 change: 1 addition & 0 deletions docker/Dockerfile.thumbv6m-none-eabi
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM ubuntu:16.04
ARG DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
RUN /common.sh
Expand Down
1 change: 1 addition & 0 deletions docker/Dockerfile.thumbv7em-none-eabi
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM ubuntu:16.04
ARG DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
RUN /common.sh
Expand Down
1 change: 1 addition & 0 deletions docker/Dockerfile.thumbv7em-none-eabihf
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM ubuntu:16.04
ARG DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
RUN /common.sh
Expand Down
1 change: 1 addition & 0 deletions docker/Dockerfile.thumbv7m-none-eabi
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM ubuntu:16.04
ARG DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
RUN /common.sh
Expand Down
1 change: 1 addition & 0 deletions docker/Dockerfile.wasm32-unknown-emscripten
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM ubuntu:16.04
ARG DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
RUN /common.sh
Expand Down
1 change: 1 addition & 0 deletions docker/Dockerfile.x86_64-linux-android
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM ubuntu:20.04
ARG DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
RUN /common.sh
Expand Down
1 change: 1 addition & 0 deletions docker/Dockerfile.x86_64-pc-windows-gnu
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM ubuntu:18.04
ARG DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
RUN /common.sh
Expand Down
1 change: 1 addition & 0 deletions docker/Dockerfile.x86_64-sun-solaris
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM ubuntu:16.04
ARG DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
RUN /common.sh
Expand Down
1 change: 1 addition & 0 deletions docker/Dockerfile.x86_64-unknown-freebsd
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM ubuntu:16.04
ARG DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
RUN /common.sh
Expand Down
1 change: 1 addition & 0 deletions docker/Dockerfile.x86_64-unknown-linux-gnu
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM ubuntu:16.04
ARG DEBIAN_FRONTEND=noninteractive

COPY linux-image.sh /
RUN /linux-image.sh x86_64
Expand Down
1 change: 1 addition & 0 deletions docker/Dockerfile.x86_64-unknown-linux-musl
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM ubuntu:20.04
ARG DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
RUN /common.sh
Expand Down
1 change: 1 addition & 0 deletions docker/Dockerfile.x86_64-unknown-netbsd
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM ubuntu:16.04
ARG DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
RUN /common.sh
Expand Down
4 changes: 2 additions & 2 deletions docker/cmake.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ set -euo pipefail
. lib.sh

main() {
local version=3.17.2
local version=3.23.1

install_packages curl

Expand All @@ -16,7 +16,7 @@ main() {

pushd "${td}"

curl --retry 3 -sSfL "https://github.com/Kitware/CMake/releases/download/v${version}/cmake-${version}-Linux-x86_64.sh" -o cmake.sh
curl --retry 3 -sSfL "https://github.com/Kitware/CMake/releases/download/v${version}/cmake-${version}-linux-x86_64.sh" -o cmake.sh
sh cmake.sh --skip-license --prefix=/usr/local

popd
Expand Down
1 change: 1 addition & 0 deletions docker/disabled/Dockerfile.x86_64-unknown-dragonfly
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM ubuntu:16.04
ARG DEBIAN_FRONTEND=noninteractive

COPY common.sh /
RUN /common.sh
Expand Down

0 comments on commit 13a1bb0

Please sign in to comment.