From 357d0b49dd760ca7c7cb4120b1f8713e9a3e3558 Mon Sep 17 00:00:00 2001
From: Jake Goulding <jake.goulding@integer32.com>
Date: Sun, 20 Nov 2022 13:33:12 -0500
Subject: [PATCH] Move to official Rust Alpine Docker image

The previous image appears to be mostly unmaintained:
https://github.com/emk/rust-musl-builder/issues/147
---
 .github/workflows/ci.yml | 12 ++++++------
 ci/workflows.yml         | 18 +++++++++---------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f7a1581e4..ffbe92079 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -194,17 +194,17 @@ jobs:
         args: "--manifest-path top-crates/Cargo.toml --check"
     - name: Build backend
       run: |-
-        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 $'
-          sudo chown -R rust:rust /home/rust/.cargo /ui/target;
+        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 '
+          apk add musl-dev openssl-dev
 
           # Unit tests
-          cargo test --locked --target=x86_64-unknown-linux-musl --no-run;
-          test_bin=$(find target/x86_64-unknown-linux-musl/debug/deps/ -type f -perm -a=x);
+          cargo test --locked --no-run;
+          test_bin=$(find target/debug/deps/ -type f -perm -a=x);
           mv "${test_bin}" target/unit_tests;
 
           # Primary binary
-          cargo build --locked --target=x86_64-unknown-linux-musl --release;
-          mv target/x86_64-unknown-linux-musl/release/ui target/ui;
+          cargo build --locked --release;
+          mv target/release/ui target/ui;
         '
     - name: Restore permissions
       run: sudo chown -R runner:docker ~/.cargo/ ui/target
diff --git a/ci/workflows.yml b/ci/workflows.yml
index dad77bbd9..eb1ef95cc 100644
--- a/ci/workflows.yml
+++ b/ci/workflows.yml
@@ -298,21 +298,21 @@ workflows:
                 run
                 --rm
                 -v $PWD/ui:/ui
-                -v ~/.cargo/git:/home/rust/.cargo/git
-                -v ~/.cargo/registry:/home/rust/.cargo/registry
+                -v ~/.cargo/git:/root/.cargo/git
+                -v ~/.cargo/registry:/root/.cargo/registry
                 --workdir /ui
-                ekidd/rust-musl-builder:stable
-                bash -c $'
-                  sudo chown -R rust:rust /home/rust/.cargo /ui/target;
+                rust:alpine
+                bash -c '
+                  apk add musl-dev openssl-dev
 
                   # Unit tests
-                  cargo test --locked --target=x86_64-unknown-linux-musl --no-run;
-                  test_bin=$(find target/x86_64-unknown-linux-musl/debug/deps/ -type f -perm -a=x);
+                  cargo test --locked --no-run;
+                  test_bin=$(find target/debug/deps/ -type f -perm -a=x);
                   mv "${test_bin}" target/unit_tests;
 
                   # Primary binary
-                  cargo build --locked --target=x86_64-unknown-linux-musl --release;
-                  mv target/x86_64-unknown-linux-musl/release/ui target/ui;
+                  cargo build --locked --release;
+                  mv target/release/ui target/ui;
                 '
 
           - name: "Restore permissions"