Skip to content

Commit 672d590

Browse files
committed
v1.71.0
- update rust 1.71.0 - update base image to debian 12.0-slim (bookworm) - remove old debian `python` package - update osxcross to `564e2b9`
1 parent 24a243a commit 672d590

File tree

3 files changed

+19
-20
lines changed

3 files changed

+19
-20
lines changed

.cirrus.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ task:
2828
timeout_in: 120m
2929
env:
3030
DOCKER_USERNAME: ENCRYPTED[db65fd6fc1af68040964a27c82f2cbd202c849199038cfddc961a573d803a4f2793ba30eede0b6bcdb6bbf29f5c4f012]
31-
DOCKER_PASSWORD: ENCRYPTED[c201154ee561b3ca486047160db1c2ae77f766abf880feb5f57a10201374ba661ec7a796928ca8eb3a92aa007c684c37]
31+
DOCKER_PASSWORD: ENCRYPTED[a1503baddfbe37c5a4474c46ec12b11beee3d16c054c1fa5bfcdde674be32524781f9d4e4d9444db6575fc5aa6270040]
3232
matrix:
3333
- name: linux-amd64
3434
env:
@@ -61,7 +61,7 @@ release_docker_builder:
6161
- build-linux-image
6262
env:
6363
DOCKER_USERNAME: ENCRYPTED[db65fd6fc1af68040964a27c82f2cbd202c849199038cfddc961a573d803a4f2793ba30eede0b6bcdb6bbf29f5c4f012]
64-
DOCKER_PASSWORD: ENCRYPTED[c201154ee561b3ca486047160db1c2ae77f766abf880feb5f57a10201374ba661ec7a796928ca8eb3a92aa007c684c37]
64+
DOCKER_PASSWORD: ENCRYPTED[a1503baddfbe37c5a4474c46ec12b11beee3d16c054c1fa5bfcdde674be32524781f9d4e4d9444db6575fc5aa6270040]
6565
login_script: |
6666
docker login --username $DOCKER_USERNAME --password $DOCKER_PASSWORD
6767
push_latest_script: |

Dockerfile

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# NOTE: Most of Dockerfile and related were borrowed from https://hub.docker.com/r/ekidd/rust-musl-builder
22

3-
FROM debian:11-slim
3+
FROM debian:12.0-slim
44

55
ARG VERSION=0.0.0
66
ENV VERSION=${VERSION}
@@ -44,7 +44,6 @@ RUN set -eux \
4444
musl-tools \
4545
patch \
4646
pkgconf \
47-
python \
4847
python3 \
4948
xutils-dev \
5049
yasm \
@@ -171,7 +170,7 @@ ARG OSX_SDK_SUM=efa167d0e463e40f9a3f3e95a2d4f265552834442872341d5669d3264ba9b702
171170
ARG OSX_VERSION_MIN=10.14
172171

173172
# OS X Cross - https://github.com/tpoechtrager/osxcross
174-
ARG OSX_CROSS_COMMIT=ed079949e7aee248ad7e7cb97726cd1c8556afd1
173+
ARG OSX_CROSS_COMMIT=564e2b9aa8e7a40da663d890c0e853a1259ff8b1
175174

176175
# Install OS X Cross
177176
# A Mac OS X cross toolchain for Linux, FreeBSD, OpenBSD and Android

README.md

+15-15
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
## Overview
2424

25-
This is a __Linux Docker image__ based on [ekidd/rust-musl-builder](https://hub.docker.com/r/ekidd/rust-musl-builder) but using latest __Debian [11-slim](https://hub.docker.com/_/debian?tab=tags&page=1&name=11-slim)__ ([Bullseye](https://www.debian.org/News/2021/20210814)).
25+
This is a __Linux Docker image__ based on [ekidd/rust-musl-builder](https://hub.docker.com/r/ekidd/rust-musl-builder) but using the latest __Debian [12-slim](https://hub.docker.com/_/debian/tags?page=1&name=12-slim)__ ([Bookworm](https://www.debian.org/News/2023/20230610)).
2626

2727
It contains essential tools for cross-compile [Rust](https://www.rust-lang.org/) projects such as __Linux__ static binaries via [musl-libc / musl-gcc](https://doc.rust-lang.org/edition-guide/rust-2018/platform-and-target-support/musl-support-for-fully-static-binaries.html) (`x86_64-unknown-linux-musl`) and __macOS__ binaries (`x86_64-apple-darwin`) via [osxcross](https://github.com/tpoechtrager/osxcross) just using the same Linux image.
2828

@@ -45,7 +45,7 @@ Below are the default toolchains included in the Docker image.
4545
docker run --rm \
4646
--volume "${PWD}/sample":/root/src \
4747
--workdir /root/src \
48-
joseluisq/rust-linux-darwin-builder:1.70.0 \
48+
joseluisq/rust-linux-darwin-builder:1.71.0 \
4949
sh -c "cargo build --release --target x86_64-unknown-linux-musl"
5050
```
5151

@@ -55,7 +55,7 @@ docker run --rm \
5555
docker run --rm \
5656
--volume "${PWD}/sample":/root/src \
5757
--workdir /root/src \
58-
joseluisq/rust-linux-darwin-builder:1.70.0 \
58+
joseluisq/rust-linux-darwin-builder:1.71.0 \
5959
sh -c "cargo build --release --target x86_64-unknown-linux-gnu"
6060
```
6161

@@ -65,7 +65,7 @@ docker run --rm \
6565
docker run --rm \
6666
--volume "${PWD}/sample":/root/src \
6767
--workdir /root/src \
68-
joseluisq/rust-linux-darwin-builder:1.70.0 \
68+
joseluisq/rust-linux-darwin-builder:1.71.0 \
6969
sh -c "cargo build --release --target x86_64-apple-darwin"
7070
```
7171

@@ -77,7 +77,7 @@ docker run --rm \
7777
docker run --rm \
7878
--volume "${PWD}/sample":/root/src \
7979
--workdir /root/src \
80-
joseluisq/rust-linux-darwin-builder:1.70.0 \
80+
joseluisq/rust-linux-darwin-builder:1.71.0 \
8181
sh -c "cargo build --release --target aarch64-unknown-linux-gnu"
8282
```
8383

@@ -87,7 +87,7 @@ docker run --rm \
8787
docker run --rm \
8888
--volume "${PWD}/sample":/root/src \
8989
--workdir /root/src \
90-
joseluisq/rust-linux-darwin-builder:1.70.0 \
90+
joseluisq/rust-linux-darwin-builder:1.71.0 \
9191
sh -c "cargo build --release --target aarch64-unknown-linux-musl"
9292
```
9393

@@ -97,7 +97,7 @@ docker run --rm \
9797
docker run --rm \
9898
--volume "${PWD}/sample":/root/src \
9999
--workdir /root/src \
100-
joseluisq/rust-linux-darwin-builder:1.70.0 \
100+
joseluisq/rust-linux-darwin-builder:1.71.0 \
101101
sh -c "cargo build --release --target aarch64-apple-darwin"
102102
```
103103

@@ -110,7 +110,7 @@ It's known that the [`CARGO_HOME`](https://doc.rust-lang.org/cargo/guide/cargo-h
110110
You can also use the image as a base for your Dockerfile:
111111

112112
```Dockerfile
113-
FROM joseluisq/rust-linux-darwin-builder:1.70.0
113+
FROM joseluisq/rust-linux-darwin-builder:1.71.0
114114
```
115115

116116
### OSXCross
@@ -153,7 +153,7 @@ compile:
153153
@docker run --rm -it \
154154
-v $(PWD):/drone/src \
155155
-w /drone/src \
156-
joseluisq/rust-linux-darwin-builder:1.70.0 \
156+
joseluisq/rust-linux-darwin-builder:1.71.0 \
157157
make cross-compile
158158
.PHONY: compile
159159

@@ -178,13 +178,13 @@ Just run the makefile `compile` target, then you will see two release binaries `
178178
make compile
179179
# 1. Cross compiling example...
180180

181-
# rustc 1.70.0 (90c541806 2023-05-31)
181+
# rustc 1.71.0 (8ede3aae2 2023-07-12)
182182
# binary: rustc
183-
# commit-hash: 90c541806f23a127002de5b4038be731ba1458ca
184-
# commit-date: 2023-05-31
185-
# host: aarch64-apple-darwin
186-
# release: 1.70.0
187-
# LLVM version: 16.0.2
183+
# commit-hash: 8ede3aae28fe6e4d52b38157d7bfe0d3bceef225
184+
# commit-date: 2023-07-12
185+
# host: aarch64-unknown-linux-gnu
186+
# release: 1.71.0
187+
# LLVM version: 16.0.5
188188

189189
# 2. Compiling application (linux-musl x86_64)...
190190
# Finished release [optimized] target(s) in 0.01s

0 commit comments

Comments
 (0)