Skip to content

Commit 651d6a6

Browse files
committed
v1.60.0
- zlib 1.2.12 - openssl 1.1.1m
1 parent 382a7dd commit 651d6a6

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

README.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ By default the working directory is `/root/src`.
3838
docker run --rm \
3939
--volume "${PWD}/sample":/root/src \
4040
--workdir /root/src \
41-
joseluisq/rust-linux-darwin-builder:1.59.0 \
41+
joseluisq/rust-linux-darwin-builder:1.60.0 \
4242
sh -c "cargo build --release"
4343
```
4444

@@ -50,20 +50,20 @@ docker run --rm \
5050
docker run --rm \
5151
--volume "${PWD}/sample":/root/src \
5252
--workdir /root/src \
53-
joseluisq/rust-linux-darwin-builder:1.59.0 \
53+
joseluisq/rust-linux-darwin-builder:1.60.0 \
5454
sh -c "cargo build --release --target x86_64-apple-darwin"
5555
```
5656

5757
### Cargo Home advice
5858

59-
It's known that the [`CARGO_HOME`](https://doc.rust-lang.org/cargo/guide/cargo-home.html#cargo-home) points to `$HOME/.cargo` by default (`/root/.cargo` in this case). However if you want to use a custom Cargo home directory make sure to copy the Cargo `config` file to the particular directory like `cp "$HOME/.cargo/config" "$CARGO_HOME/"` before to cross-compile your program. Otherwise you could face a linkage error when for example if you want to cross-compile to an `x86_64-apple-darwin` target.
59+
It's known that the [`CARGO_HOME`](https://doc.rust-lang.org/cargo/guide/cargo-home.html#cargo-home) points to `$HOME/.cargo` by default (`/root/.cargo` in this case). However if you want to use a custom Cargo home directory then make sure to copy the Cargo `config` file to the particular directory like `cp "$HOME/.cargo/config" "$CARGO_HOME/"` before to cross-compile your program. Otherwise you could face a linking error when for example you want to cross-compile to an `x86_64-apple-darwin` target.
6060

6161
### Dockerfile
6262

6363
You can also use the image as a base for your own Dockerfile:
6464

6565
```Dockerfile
66-
FROM joseluisq/rust-linux-darwin-builder:1.59.0
66+
FROM joseluisq/rust-linux-darwin-builder:1.60.0
6767
```
6868

6969
### OSXCross
@@ -106,7 +106,7 @@ compile:
106106
@docker run --rm -it \
107107
-v $(PWD):/drone/src \
108108
-w /drone/src \
109-
joseluisq/rust-linux-darwin-builder:1.59.0 \
109+
joseluisq/rust-linux-darwin-builder:1.60.0 \
110110
make cross-compile
111111
.PHONY: compile
112112

@@ -131,13 +131,13 @@ Just run the makefile `compile` target, then you will see two release binaries `
131131
make compile
132132
# 1. Cross compiling example...
133133

134-
# rustc 1.59.0 (9d1b2106e 2022-02-23)
134+
# rustc 1.60.0 (7737e0b5c 2022-04-04)
135135
# binary: rustc
136-
# commit-hash: 9d1b2106e23b1abd32fce1f17267604a5102f57a
137-
# commit-date: 2022-02-23
138-
# host: x86_64-apple-darwin
139-
# release: 1.59.0
140-
# LLVM version: 13.0.
136+
# commit-hash: 7737e0b5c4103216d6fd8cf941b7ab9bdbaace7c
137+
# commit-date: 2022-04-04
138+
# host: x86_64-unknown-linux-gnu
139+
# release: 1.60.0
140+
# LLVM version: 14.0.0
141141

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

docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ ARG TOOLCHAIN=stable
1818

1919
# OpenSSL v1.1.1
2020
# https://www.openssl.org/source/old/1.1.1/
21-
ARG OPENSSL_VERSION=1.1.1l
21+
ARG OPENSSL_VERSION=1.1.1m
2222

2323
# zlib - http://zlib.net/
2424
ARG ZLIB_VERSION=1.2.12

0 commit comments

Comments
 (0)