Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Draft: Updated Docker image to Ubuntu-24.04 and Cargo dependencies #1580

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Draft: Updated Docker image to Ubuntu-24.04 and Cargo dependencies #1580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
236 changes: 181 additions & 55 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ keywords = ["cross", "compilation", "testing", "tool"]
license = "MIT OR Apache-2.0"
name = "cross"
repository = "https://github.com/cross-rs/cross"
version = "0.2.5"
version = "0.2.6"
edition = "2021"
include = [
"src/**/*",
Expand All @@ -17,7 +17,7 @@ include = [
"README.md",
"assets/*",
]
rust-version = "1.77.2"
rust-version = "1.82.0"

[features]
default = []
Expand All @@ -34,24 +34,24 @@ eyre = "0.6.8"
thiserror = "1.0.38"
home = "0.5.4"
rustc_version = "0.4.0"
toml = "0.7.0"
which = { version = "4.4.0", default-features = false }
toml = "0.8.19"
which = { version = "6.0.3", default-features = false }
shell-escape = "0.1.5"
serde = { version = "1.0.152", features = ["derive"] }
serde_json = { version = "1.0.91", features = ["raw_value"] }
serde_ignored = "0.1.7"
shell-words = "1.1.0"
const-sha1 = "0.2.0"
const-sha1 = "0.3.0"
signal-hook = { version = "0.3.15" }
directories = "4.0.1"
directories = "5.0.1"
walkdir = { version = "2.3.2", optional = true }
tempfile = "3.3.0"
owo-colors = { version = "3.5.0", features = ["supports-colors"] }
semver = "1.0.16"
semver = "1.0.23"
is_ci = "1.1.1"

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

[target.'cfg(windows)'.dependencies]
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.aarch64-linux-android
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04 as cross-base
FROM ubuntu:24.04 as cross-base
ENV DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.aarch64-unknown-freebsd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04 as cross-base
FROM ubuntu:24.04 as cross-base
ENV DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.aarch64-unknown-linux-gnu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04 as cross-base
FROM ubuntu:24.04 as cross-base
ENV DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.aarch64-unknown-linux-gnu.centos
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04 as base
FROM ubuntu:24.04 as base

COPY lib.sh /
COPY linux-image.sh /
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.aarch64-unknown-linux-musl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04 as cross-base
FROM ubuntu:24.04 as cross-base
ENV DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.arm-linux-androideabi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04 as cross-base
FROM ubuntu:24.04 as cross-base
ENV DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.arm-unknown-linux-gnueabi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04 as cross-base
FROM ubuntu:24.04 as cross-base
ENV DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.arm-unknown-linux-gnueabihf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04 as cross-base
FROM ubuntu:24.04 as cross-base
ENV DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.arm-unknown-linux-musleabi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04 as cross-base
FROM ubuntu:24.04 as cross-base
ENV DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.arm-unknown-linux-musleabihf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04 as cross-base
FROM ubuntu:24.04 as cross-base
ENV DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.armv5te-unknown-linux-gnueabi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04 as cross-base
FROM ubuntu:24.04 as cross-base
ENV DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.armv5te-unknown-linux-musleabi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04 as cross-base
FROM ubuntu:24.04 as cross-base
ENV DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.armv7-linux-androideabi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04 as cross-base
FROM ubuntu:24.04 as cross-base
ENV DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.armv7-unknown-linux-gnueabi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04 as cross-base
FROM ubuntu:24.04 as cross-base
ENV DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.armv7-unknown-linux-gnueabihf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04 as cross-base
FROM ubuntu:24.04 as cross-base
ENV DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.armv7-unknown-linux-musleabi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04 as cross-base
FROM ubuntu:24.04 as cross-base
ENV DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.armv7-unknown-linux-musleabihf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04 as cross-base
FROM ubuntu:24.04 as cross-base
ENV DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile.cross
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM ubuntu:20.04 as rust
FROM ubuntu:24.04 as rust
ENV DEBIAN_FRONTEND=noninteractive
COPY docker/lib.sh docker/cross.sh /
COPY ./ /project
RUN /cross.sh /project

# we build our images in 2 steps, to ensure we have a compact
# image, since we want to add our current subdirectory
FROM ubuntu:20.04 as base
FROM ubuntu:24.04 as base
COPY --from=rust /root/.cargo /root/.cargo
COPY --from=rust /root/.rustup /root/.rustup

Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.i586-unknown-linux-gnu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04 as cross-base
FROM ubuntu:24.04 as cross-base
ENV DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.i586-unknown-linux-musl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04 as cross-base
FROM ubuntu:24.04 as cross-base
ENV DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.i686-linux-android
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04 as cross-base
FROM ubuntu:24.04 as cross-base
ENV DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.i686-pc-windows-gnu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04 as cross-base
FROM ubuntu:24.04 as cross-base
ENV DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.i686-unknown-freebsd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04 as cross-base
FROM ubuntu:24.04 as cross-base
ENV DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.i686-unknown-linux-gnu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04 as cross-base
FROM ubuntu:24.04 as cross-base
ENV DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.i686-unknown-linux-musl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04 as cross-base
FROM ubuntu:24.04 as cross-base
ENV DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.loongarch64-unknown-linux-gnu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04 as cross-base
FROM ubuntu:24.04 as cross-base
ENV DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.loongarch64-unknown-linux-musl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04 as cross-base
FROM ubuntu:24.04 as cross-base
ENV DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.mips-unknown-linux-gnu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04 as cross-base
FROM ubuntu:24.04 as cross-base
ENV DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.mips-unknown-linux-musl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04 as cross-base
FROM ubuntu:24.04 as cross-base
ENV DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.mips64-unknown-linux-gnuabi64
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04 as cross-base
FROM ubuntu:24.04 as cross-base
ENV DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.mips64-unknown-linux-muslabi64
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04 as cross-base
FROM ubuntu:24.04 as cross-base
ENV DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.mips64el-unknown-linux-gnuabi64
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04 as cross-base
FROM ubuntu:24.04 as cross-base
ENV DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.mips64el-unknown-linux-muslabi64
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04 as cross-base
FROM ubuntu:24.04 as cross-base
ENV DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.mipsel-unknown-linux-gnu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04 as cross-base
FROM ubuntu:24.04 as cross-base
ENV DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.mipsel-unknown-linux-musl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04 as cross-base
FROM ubuntu:24.04 as cross-base
ENV DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.native
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This dockerfile is used when the target matches the images platform in `build-docker-image`
FROM ubuntu:20.04 as cross-base
FROM ubuntu:24.04 as cross-base
ENV DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.native.centos
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04 as base
FROM ubuntu:24.04 as base
ENV DEBIAN_FRONTEND=noninteractive

ARG TARGETARCH
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.powerpc-unknown-linux-gnu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04 as cross-base
FROM ubuntu:24.04 as cross-base
ENV DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.powerpc64-unknown-linux-gnu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04 as cross-base
FROM ubuntu:24.04 as cross-base
ENV DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.powerpc64le-unknown-linux-gnu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04 as cross-base
FROM ubuntu:24.04 as cross-base
ENV DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.riscv64gc-unknown-linux-gnu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:22.04 as cross-base
FROM ubuntu:24.04 as cross-base
ENV DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.s390x-unknown-linux-gnu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04 as cross-base
FROM ubuntu:24.04 as cross-base
ENV DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.sparc64-unknown-linux-gnu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04 as cross-base
FROM ubuntu:24.04 as cross-base
ENV DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.sparcv9-sun-solaris
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04 as cross-base
FROM ubuntu:24.04 as cross-base
ENV DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.thumbv6m-none-eabi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04 as cross-base
FROM ubuntu:24.04 as cross-base
ENV DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.thumbv7em-none-eabi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04 as cross-base
FROM ubuntu:24.04 as cross-base
ENV DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.thumbv7em-none-eabihf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04 as cross-base
FROM ubuntu:24.04 as cross-base
ENV DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.thumbv7m-none-eabi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04 as cross-base
FROM ubuntu:24.04 as cross-base
ENV DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.thumbv7neon-linux-androideabi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04 as cross-base
FROM ubuntu:24.04 as cross-base
ENV DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.thumbv7neon-unknown-linux-gnueabihf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04 as cross-base
FROM ubuntu:24.04 as cross-base
ENV DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.thumbv8m.base-none-eabi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04 as cross-base
FROM ubuntu:24.04 as cross-base
ENV DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.thumbv8m.main-none-eabi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04 as cross-base
FROM ubuntu:24.04 as cross-base
ENV DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.thumbv8m.main-none-eabihf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04 as cross-base
FROM ubuntu:24.04 as cross-base
ENV DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.x86_64-linux-android
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04 as cross-base
FROM ubuntu:24.04 as cross-base
ENV DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.x86_64-pc-solaris
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04 as cross-base
FROM ubuntu:24.04 as cross-base
ENV DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.x86_64-pc-windows-gnu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04 as cross-base
FROM ubuntu:24.04 as cross-base
ENV DEBIAN_FRONTEND=noninteractive

COPY common.sh lib.sh /
Expand Down
Loading
Loading