From 33163ab39f9f5b1044cf79033add463bfc02eadb Mon Sep 17 00:00:00 2001
From: Stefano Pigozzi <me@steffo.eu>
Date: Mon, 20 Mar 2023 00:11:55 +0100
Subject: [PATCH] Fix some more compilation

---
 Dockerfile | 50 ++++++++++++++++++++++++++++++++------------------
 1 file changed, 32 insertions(+), 18 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 046fbc2..31e1d50 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,58 +1,72 @@
 FROM --platform=${BUILDPLATFORM} rust:1.68-bullseye AS builder
 ARG BUILDPLATFORM
 ARG TARGETPLATFORM
-ARG RUSTTARGET
 
 RUN apt-get update && \
     apt-get upgrade --assume-yes
 
-RUN \
-    if [ "${TARGETPLATFORM}" = "linux/amd64" ]; then \
-        apt-get install --assume-yes gcc-x86-64-linux-gnu; \
-    fi && \
-    if [ "${TARGETPLATFORM}" = "linux/arm64" ]; then \
-        apt-get install --assume-yes gcc-aarch64-linux-gnu; \
-    fi && \
-    if [ "${TARGETPLATFORM}" = "linux/arm/v7" ]; then \
-        apt-get install --assume-yes gcc-arm-linux-gnueabihf; \
-    fi
-
 RUN \
     mkdir .cargo && \
     echo '[net]' >> .cargo/config.toml && \
     echo 'git-fetch-with-cli = true' >> .cargo/config.toml && \
+    echo >> .cargo/config.toml && \
     if [ "${BUILDPLATFORM}" != "${TARGETPLATFORM}" ]; then \
         if [ "${TARGETPLATFORM}" = "linux/amd64" ]; then \
+            apt-get install --assume-yes gcc-x86-64-linux-gnu; \
             echo '[target.x86_64-unknown-linux-gnu]' >> .cargo/config.toml; \
             echo 'linker = "x86-64-linux-gnu-gcc"' >> .cargo/config.toml; \
+            echo >> .cargo/config.toml; \
         fi && \
         if [ "${TARGETPLATFORM}" = "linux/arm64" ]; then \
+            apt-get install --assume-yes gcc-aarch64-linux-gnu; \
             echo '[target.aarch64-unknown-linux-gnu]' >> .cargo/config.toml; \
             echo 'linker = "aarch64-linux-gnu-gcc"' >> .cargo/config.toml; \
+            echo >> .cargo/config.toml; \
         fi && \
         if [ "${TARGETPLATFORM}" = "linux/arm/v7" ]; then \
+            apt-get install --assume-yes gcc-arm-linux-gnueabihf; \
             echo '[target.armv7-unknown-linux-gnueabihf]' >> .cargo/config.toml; \
             echo 'linker = "arm-linux-gnueabihf-gcc"' >> .cargo/config.toml; \
+            echo >> .cargo/config.toml; \
         fi \
     fi
 
-RUN rustup target add ${RUSTTARGET}
+RUN \
+    if [ "${TARGETPLATFORM}" = "linux/amd64" ]; then \
+        RUSTTARGET=x86_64-unknown-linux-gnu; \
+    fi && \
+    if [ "${TARGETPLATFORM}" = "linux/arm64" ]; then \
+        RUSTTARGET=aarch64-unknown-linux-gnu; \
+    fi && \
+    if [ "${TARGETPLATFORM}" = "linux/arm/v7" ]; then \
+        RUSTTARGET=armv7-unknown-linux-gnueabihf; \
+    fi && \
+    rustup target add ${RUSTTARGET}
 
 WORKDIR /usr/src/patched_porobot/
 COPY ./ ./
 
-RUN cargo build --all-features --bins --release --target=${RUSTTARGET}
+RUN \
+    if [ "${TARGETPLATFORM}" = "linux/amd64" ]; then \
+        RUSTTARGET=x86_64-unknown-linux-gnu; \
+    fi && \
+    if [ "${TARGETPLATFORM}" = "linux/arm64" ]; then \
+        RUSTTARGET=aarch64-unknown-linux-gnu; \
+    fi && \
+    if [ "${TARGETPLATFORM}" = "linux/arm/v7" ]; then \
+        RUSTTARGET=armv7-unknown-linux-gnueabihf; \
+    fi && \
+    cargo build --all-features --bins --release --target=${RUSTTARGET}
 
 #############################################################################
 
 FROM --platform=${TARGETPLATFORM} rust:1.68-slim-bullseye AS final
-ARG RUSTTARGET
 
 WORKDIR /usr/src/patched_porobot/
 COPY --from=builder \
-    /usr/src/patched_porobot/target/${RUSTTARGET}/release/patched_porobot_discord \
-    /usr/src/patched_porobot/target/${RUSTTARGET}/release/patched_porobot_telegram \
-    /usr/src/patched_porobot/target/${RUSTTARGET}/release/patched_porobot_matrix \
+    /usr/src/patched_porobot/target/*/release/patched_porobot_discord \
+    /usr/src/patched_porobot/target/*/release/patched_porobot_telegram \
+    /usr/src/patched_porobot/target/*/release/patched_porobot_matrix \
     /usr/bin/
 
 ENTRYPOINT []