Skip to content

Commit 2e88385

Browse files
committed
v1.74.0
- debian 12.2 - rust 1.74.0 - libpq 15.5 - osxcross ff8d100
1 parent c52ae74 commit 2e88385

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

Dockerfile

+3-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:12.1-slim
3+
FROM debian:12.2-slim
44

55
ARG VERSION=0.0.0
66
ENV VERSION=${VERSION}
@@ -132,7 +132,7 @@ RUN set -eux \
132132

133133

134134
# libpq - https://ftp.postgresql.org/pub/source/
135-
ARG POSTGRESQL_VERSION=15.4
135+
ARG POSTGRESQL_VERSION=15.5
136136

137137
RUN set -eux \
138138
&& echo "Building libpq ${POSTGRESQL_VERSION}..." \
@@ -174,7 +174,7 @@ ARG OSX_SDK_SUM=518e35eae6039b3f64e8025f4525c1c43786cc5cf39459d609852faf091e34be
174174
ARG OSX_VERSION_MIN=10.14
175175

176176
# OS X Cross - https://github.com/tpoechtrager/osxcross
177-
ARG OSX_CROSS_COMMIT=5e1b71fcceb23952f3229995edca1b6231525b5b
177+
ARG OSX_CROSS_COMMIT=ff8d100f3f026b4ffbe4ce96d8aac4ce06f1278b
178178

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

README.md

+13-13
Original file line numberDiff line numberDiff line change
@@ -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.73.0 \
48+
joseluisq/rust-linux-darwin-builder:1.74.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.73.0 \
58+
joseluisq/rust-linux-darwin-builder:1.74.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.73.0 \
68+
joseluisq/rust-linux-darwin-builder:1.74.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.73.0 \
80+
joseluisq/rust-linux-darwin-builder:1.74.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.73.0 \
90+
joseluisq/rust-linux-darwin-builder:1.74.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.73.0 \
100+
joseluisq/rust-linux-darwin-builder:1.74.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.73.0
113+
FROM joseluisq/rust-linux-darwin-builder:1.74.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.73.0 \
156+
joseluisq/rust-linux-darwin-builder:1.74.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.73.0 (cc66ad468 2023-10-03)
181+
# rustc 1.74.0 (79e9716c9 2023-11-13)
182182
# binary: rustc
183-
# commit-hash: cc66ad468955717ab92600c770da8c1601a4ff33
184-
# commit-date: 2023-10-03
183+
# commit-hash: 79e9716c980570bfd1f666e3b16ac583f0168962
184+
# commit-date: 2023-11-13
185185
# host: x86_64-unknown-linux-gnu
186-
# release: 1.73.0
187-
# LLVM version: 17.0.2
186+
# release: 1.74.0
187+
# LLVM version: 17.0.4
188188

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

0 commit comments

Comments
 (0)