From 638b9d1c3345c789c1af617dfe2ff1bf1119e00a Mon Sep 17 00:00:00 2001
From: Quentin McGaw <quentin.mcgaw@gmail.com>
Date: Sat, 17 Jul 2021 12:40:58 -0700
Subject: [PATCH] CI fixes: dockerhub description and linting (#68)

- Github workflow: upgrade `peter-evans/dockerhub-description` to `v2.4.3`
- Dockerfile: fix: lint stage not running, changed from `ENTRYPOINT` to `RUN`
- Dockerfile: fix: install clippy for build platform
---
 .github/workflows/dockerhub-description.yml | 2 +-
 Dockerfile                                  | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/dockerhub-description.yml b/.github/workflows/dockerhub-description.yml
index d537bed..bbdafac 100644
--- a/.github/workflows/dockerhub-description.yml
+++ b/.github/workflows/dockerhub-description.yml
@@ -12,7 +12,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2.3.4
       - name: Docker Hub Description
-        uses: peter-evans/dockerhub-description@2.4.2
+        uses: peter-evans/dockerhub-description@v2.4.3
         with:
           username: mindflavor
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
diff --git a/Dockerfile b/Dockerfile
index c726a98..3224b20 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -80,6 +80,9 @@ RUN rustup target add "$(cat /tmp/rusttarget)"
 # Copy .cargo/config for cross build configuration
 COPY .cargo ./.cargo
 
+# Install Clippy for build platform
+RUN rustup component add clippy
+
 # Install dependencies
 RUN echo 'fn main() {}' > src/main.rs && \
     RUSTFLAGS="$(cat /tmp/rustflags)" \
@@ -93,8 +96,7 @@ RUN rm -r \
 COPY . .
 
 FROM base AS lint
-ENTRYPOINT \
-    RUSTFLAGS="$(cat /tmp/rustflags)" \
+RUN RUSTFLAGS="$(cat /tmp/rustflags)" \
     CC="$(cat /tmp/musl)-gcc" \
     cargo clippy --target "$(cat /tmp/rusttarget)"