Skip to content

Commit

Permalink
Update docker with latest rust nightly build
Browse files Browse the repository at this point in the history
  • Loading branch information
@mmicko
mmicko committed Sep 16, 2024
1 parent 8bd73a4 commit 4104169
Show file tree
Hide file tree
Showing 11 changed files with 31 additions and 6 deletions.
5 changes: 5 additions & 0 deletions docker/cross-darwin-arm64/Dockerfile.21
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
FROM yosyshq/cross-darwin-arm64:2.0

RUN RUSTUP_HOME=/opt/rust/rustup CARGO_HOME=/opt/rust/cargo rustup toolchain install nightly
RUN RUSTUP_HOME=/opt/rust/rustup CARGO_HOME=/opt/rust/cargo rustup override set nightly
RUN RUSTUP_HOME=/opt/rust/rustup CARGO_HOME=/opt/rust/cargo rustup target add aarch64-apple-darwin
2 changes: 1 addition & 1 deletion docker/cross-darwin-arm64/build.sh
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
docker build -t="yosyshq/cross-darwin-arm64:2.0" -f Dockerfile .
docker build -t="yosyshq/cross-darwin-arm64:2.1" -f Dockerfile.21 .
5 changes: 5 additions & 0 deletions docker/cross-darwin-x64/Dockerfile.21
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
FROM yosyshq/cross-darwin-x64:2.0

RUN RUSTUP_HOME=/opt/rust/rustup CARGO_HOME=/opt/rust/cargo rustup toolchain install nightly
RUN RUSTUP_HOME=/opt/rust/rustup CARGO_HOME=/opt/rust/cargo rustup override set nightly
RUN RUSTUP_HOME=/opt/rust/rustup CARGO_HOME=/opt/rust/cargo rustup target add x86_64-apple-darwin
2 changes: 1 addition & 1 deletion docker/cross-darwin-x64/build.sh
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
docker build -t="yosyshq/cross-darwin-x64:2.0" -f Dockerfile .
docker build -t="yosyshq/cross-darwin-x64:2.1" -f Dockerfile.21 .
5 changes: 5 additions & 0 deletions docker/cross-linux-arm64/Dockerfile.21
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
FROM yosyshq/cross-linux-arm64:2.0

RUN RUSTUP_HOME=/opt/rust/rustup CARGO_HOME=/opt/rust/cargo rustup toolchain install nightly
RUN RUSTUP_HOME=/opt/rust/rustup CARGO_HOME=/opt/rust/cargo rustup override set nightly
RUN RUSTUP_HOME=/opt/rust/rustup CARGO_HOME=/opt/rust/cargo rustup target add aarch64-unknown-linux-gnu
2 changes: 1 addition & 1 deletion docker/cross-linux-arm64/build.sh
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
docker build -t="yosyshq/cross-linux-arm64:2.0" -f Dockerfile .
docker build -t="yosyshq/cross-linux-arm64:2.1" -f Dockerfile.21 .
4 changes: 4 additions & 0 deletions docker/cross-linux-x64/Dockerfile.21
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
FROM yosyshq/cross-linux-x64:2.0

RUN RUSTUP_HOME=/opt/rust/rustup CARGO_HOME=/opt/rust/cargo rustup toolchain install nightly
RUN RUSTUP_HOME=/opt/rust/rustup CARGO_HOME=/opt/rust/cargo rustup override set nightly
2 changes: 1 addition & 1 deletion docker/cross-linux-x64/build.sh
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
docker build -t="yosyshq/cross-linux-x64:2.0" -f Dockerfile .
docker build -t="yosyshq/cross-linux-x64:2.1" -f Dockerfile.21 .
6 changes: 6 additions & 0 deletions docker/cross-windows-x64/Dockerfile.21
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
FROM yosyshq/cross-windows-x64:2.0

RUN RUSTUP_HOME=/opt/rust/rustup CARGO_HOME=/opt/rust/cargo rustup toolchain install nightly
RUN RUSTUP_HOME=/opt/rust/rustup CARGO_HOME=/opt/rust/cargo rustup override set nightly
RUN RUSTUP_HOME=/opt/rust/rustup CARGO_HOME=/opt/rust/cargo rustup target add x86_64-pc-windows-gnu
RUN dnf install -y openssl
2 changes: 1 addition & 1 deletion docker/cross-windows-x64/build.sh
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
docker build -t="yosyshq/cross-windows-x64:2.0" -f Dockerfile .
docker build -t="yosyshq/cross-windows-x64:2.1" -f Dockerfile.21 .
2 changes: 1 addition & 1 deletion src/base.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ def executeBuild(target, arch, prefix, build_dir, output_dir, nproc, pack_source
else:
params += ['-e', '{}={}'.format(i, j)]
params += [
'yosyshq/cross-'+ arch + ':2.0',
'yosyshq/cross-'+ arch + ':2.1',
'bash', scriptfile.name
]
return run_live(params, cwd=build_dir)
Expand Down

0 comments on commit 4104169

Please sign in to comment.