From c33d1ea2cea75eb11630334e89e84a2e32a4c04d Mon Sep 17 00:00:00 2001 From: Daniel <46288749+DaXcess@users.noreply.github.com> Date: Sun, 24 Sep 2023 22:12:15 +0200 Subject: [PATCH] Update Dockerfile --- Dockerfile | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/Dockerfile b/Dockerfile index c3443a7..38e72a2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,10 +12,8 @@ COPY . . RUN rustup target add x86_64-unknown-linux-gnu aarch64-unknown-linux-gnu # Remove `--features=stats` if you want to deploy without stats collection -#RUN cargo build --features=stats --release \ -# --target=x86_64-unknown-linux-gnu --target=aarch64-unknown-linux-gnu - -RUN echo woah +RUN cargo build --features=stats --release \ + --target=x86_64-unknown-linux-gnu --target=aarch64-unknown-linux-gnu # Runtime FROM debian:buster-slim @@ -25,22 +23,22 @@ ENV TARGETPLATFORM=$TARGETPLATFORM # Add extra runtime dependencies here # RUN apt-get update && apt-get install -yqq --no-install-recommends \ -# openssl ca-certificates && rm -rf /var/lib/apt/lists/* +# openssl ca-certificates && rm -rf /var/lib/apt/lists/* # Copy spoticord binaries from builder to /tmp -#COPY --from=builder \ -# /app/target/x86_64-unknown-linux-gnu/release/spoticord /tmp/x86_64 -#COPY --from=builder \ -# /app/target/aarch64-unknown-linux-gnu/release/spoticord /tmp/aarch64 +COPY --from=builder \ + /app/target/x86_64-unknown-linux-gnu/release/spoticord /tmp/x86_64 +COPY --from=builder \ + /app/target/aarch64-unknown-linux-gnu/release/spoticord /tmp/aarch64 # Copy appropiate binary for target arch from /tmp -#RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then \ -# cp /tmp/x86_64 /usr/local/bin/spoticord; \ -# elif [ "$TARGETPLATFORM" = "linux/arm64" ]; then \ -# cp /tmp/aarch64 /usr/local/bin/spoticord; \ -# fi +RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then \ + cp /tmp/x86_64 /usr/local/bin/spoticord; \ + elif [ "$TARGETPLATFORM" = "linux/arm64" ]; then \ + cp /tmp/aarch64 /usr/local/bin/spoticord; \ + fi # Delete unused binaries -# RUN rm -rvf /tmp/x86_64 /tmp/aarch64 +RUN rm -rvf /tmp/x86_64 /tmp/aarch64 ENTRYPOINT [ "/usr/local/bin/spoticord" ]