Skip to content

Commit e2bb55c

Browse files
committed
Move to official Rust Alpine Docker image
The previous image appears to be mostly unmaintained: emk/rust-musl-builder#147
1 parent dacb49a commit e2bb55c

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -194,17 +194,17 @@ jobs:
194194
args: "--manifest-path top-crates/Cargo.toml --check"
195195
- name: Build backend
196196
run: |-
197-
mkdir -p ui/target; docker run --rm -v $PWD/ui:/ui -v ~/.cargo/git:/home/rust/.cargo/git -v ~/.cargo/registry:/home/rust/.cargo/registry --workdir /ui ekidd/rust-musl-builder:stable bash -c $'
198-
sudo chown -R rust:rust /home/rust/.cargo /ui/target;
197+
mkdir -p ui/target; docker run --rm -v $PWD/ui:/ui -v ~/.cargo/git:/root/.cargo/git -v ~/.cargo/registry:/root/.cargo/registry --workdir /ui rust:alpine bash -c $'
198+
apk add musl-dev openssl-dev
199199
200200
# Unit tests
201-
cargo test --locked --target=x86_64-unknown-linux-musl --no-run;
202-
test_bin=$(find target/x86_64-unknown-linux-musl/debug/deps/ -type f -perm -a=x);
201+
cargo test --locked --no-run;
202+
test_bin=$(find target/debug/deps/ -type f -perm -a=x);
203203
mv "${test_bin}" target/unit_tests;
204204
205205
# Primary binary
206-
cargo build --locked --target=x86_64-unknown-linux-musl --release;
207-
mv target/x86_64-unknown-linux-musl/release/ui target/ui;
206+
cargo build --locked --release;
207+
mv target/release/ui target/ui;
208208
'
209209
- name: Restore permissions
210210
run: sudo chown -R runner:docker ~/.cargo/ ui/target

ci/workflows.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -298,21 +298,21 @@ workflows:
298298
run
299299
--rm
300300
-v $PWD/ui:/ui
301-
-v ~/.cargo/git:/home/rust/.cargo/git
302-
-v ~/.cargo/registry:/home/rust/.cargo/registry
301+
-v ~/.cargo/git:/root/.cargo/git
302+
-v ~/.cargo/registry:/root/.cargo/registry
303303
--workdir /ui
304-
ekidd/rust-musl-builder:stable
304+
rust:alpine
305305
bash -c $'
306-
sudo chown -R rust:rust /home/rust/.cargo /ui/target;
306+
apk add musl-dev openssl-dev
307307
308308
# Unit tests
309-
cargo test --locked --target=x86_64-unknown-linux-musl --no-run;
310-
test_bin=$(find target/x86_64-unknown-linux-musl/debug/deps/ -type f -perm -a=x);
309+
cargo test --locked --no-run;
310+
test_bin=$(find target/debug/deps/ -type f -perm -a=x);
311311
mv "${test_bin}" target/unit_tests;
312312
313313
# Primary binary
314-
cargo build --locked --target=x86_64-unknown-linux-musl --release;
315-
mv target/x86_64-unknown-linux-musl/release/ui target/ui;
314+
cargo build --locked --release;
315+
mv target/release/ui target/ui;
316316
'
317317
318318
- name: "Restore permissions"

0 commit comments

Comments
 (0)