Skip to content

Commit

Permalink
Merge #593 #688 #694
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



694: Upgrade nix to 0.24, limit features r=Emilgardis a=rtzoeller

This reduces cross's compile time slightly, and removes memoffset as an indirect dependency.

Co-authored-by: Alex Huszagh <ahuszagh@gmail.com>
Co-authored-by: Jules Bertholet <jules.bertholet@gmail.com>
Co-authored-by: Ryan Zoeller <rtzoeller@rtzoeller.com>
  • Loading branch information
@bors @Alexhuszagh
@Jules-Bertholet @rtzoeller
4 people committed Apr 23, 2022
4 parents 1be0d93 + eab33d6 + fb89f77 + 3e1bd6f commit 89e88a3
Show file tree
Hide file tree
Showing 50 changed files with 82 additions and 53 deletions.
82 changes: 32 additions & 50 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ serde_json = "1"
serde_ignored = "0.1.2"

[target.'cfg(not(windows))'.dependencies]
nix = "0.23"
nix = { version = "0.24", default-features = false, features = ["user"] }
libc = "0.2"

[target.'cfg(windows)'.dependencies]
Expand Down
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
Loading

0 comments on commit 89e88a3

Please sign in to comment.