Skip to content

Commit a36ef59

Browse files
committed
1.56.0
1 parent 625ba96 commit a36ef59

File tree

3 files changed

+12
-9
lines changed

3 files changed

+12
-9
lines changed

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ test-ci:
2020
&& echo "Compiling application (linux-musl x86_64)..." \
2121
&& cargo build --release --target x86_64-unknown-linux-musl \
2222
&& du -sh target/x86_64-unknown-linux-musl/release/helloworld \
23+
&& ./target/x86_64-unknown-linux-musl/release/helloworld \
2324
&& echo \
2425
&& echo "Compiling application (apple-darwin x86_64)..." \
2526
&& cargo build --release --target x86_64-apple-darwin \

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ By default the working directory is `/root/src`.
2626
docker run --rm \
2727
--volume "${PWD}/sample":/root/src \
2828
--workdir /root/src \
29-
joseluisq/rust-linux-darwin-builder:1.55.0 \
29+
joseluisq/rust-linux-darwin-builder:1.56.0 \
3030
sh -c "cargo build --release"
3131
```
3232

@@ -36,7 +36,7 @@ docker run --rm \
3636
docker run --rm \
3737
--volume "${PWD}/sample":/root/src \
3838
--workdir /root/src \
39-
joseluisq/rust-linux-darwin-builder:1.55.0 \
39+
joseluisq/rust-linux-darwin-builder:1.56.0 \
4040
sh -c "cargo build --release --target x86_64-apple-darwin"
4141
```
4242

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

5151
```Dockerfile
52-
FROM joseluisq/rust-linux-darwin-builder:1.55.0
52+
FROM joseluisq/rust-linux-darwin-builder:1.56.0
5353
```
5454

5555
### OSXCross

docker/Dockerfile

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@
33

44
FROM debian:buster-slim
55

6-
LABEL maintainer="Jose Quintana <git.io/joseluisq>"
7-
86
ARG VERSION=0.0.0
97
ENV VERSION=${VERSION}
108

9+
LABEL version="${VERSION}" \
10+
description="Use same Docker image for compiling Rust programs for Linux (musl libc) & macOS (osxcross)." \
11+
maintainer="Jose Quintana <joseluisq.net>"
12+
1113

1214
# Rust stable toolchain
1315
ARG TOOLCHAIN=stable
@@ -22,15 +24,15 @@ ARG OPENSSL_VERSION=1.1.1k
2224
ARG ZLIB_VERSION=1.2.11
2325

2426
# libpq - https://ftp.postgresql.org/pub/source/
25-
ARG POSTGRESQL_VERSION=13.4
27+
ARG POSTGRESQL_VERSION=14.0
2628

27-
# Mac OS X SDK version
29+
# Mac OS X SDK version - https://github.com/joseluisq/macosx-sdks
2830
ARG OSX_SDK_VERSION=11.3
2931
ARG OSX_SDK_SUM=9adc1373d3879e1973d28ad9f17c9051b02931674a3ec2a2498128989ece2cb1
3032
ARG OSX_VERSION_MIN=10.14
3133

32-
# OS X Cross
33-
ARG OSX_CROSS_COMMIT=de6c72eff2d6013f5af46fba1fa205654c5cf5e2
34+
# OS X Cross - https://github.com/tpoechtrager/osxcross
35+
ARG OSX_CROSS_COMMIT=de6ec57895713a090fee05cbc58e43b5d916ba33
3436

3537
# Make sure we have basic dev tools for building C libraries. Our goal
3638
# here is to support the musl-libc builds and Cargo builds needed for a

0 commit comments

Comments
 (0)