From c2a46eaec4e4321fbaa3576cc826e37294ae941e Mon Sep 17 00:00:00 2001
From: "Aode (lion)" <asonix@asonix.dog>
Date: Sat, 28 Aug 2021 17:55:54 -0500
Subject: [PATCH] Version v0.3.0-alpha.13-shell-out-r0

---
 docker/prod/Dockerfile.amd64   | 5 +++--
 docker/prod/Dockerfile.arm32v7 | 5 +++--
 docker/prod/Dockerfile.arm64v8 | 3 ++-
 docker/prod/docker-compose.yml | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/docker/prod/Dockerfile.amd64 b/docker/prod/Dockerfile.amd64
index 947d55b..468f2da 100644
--- a/docker/prod/Dockerfile.amd64
+++ b/docker/prod/Dockerfile.amd64
@@ -59,7 +59,7 @@ RUN \
 WORKDIR /opt/build/pict-rs
 
 RUN \
- USER=build cargo build --release --target $TARGET --$BUILD_MODE && \
+ USER=build cargo build --target $TARGET --$BUILD_MODE && \
  $TOOL-strip target/$TARGET/$BUILD_MODE/$BINARY
 
 # production environment
@@ -68,9 +68,10 @@ FROM amd64/alpine:3.14
 ARG UID=991
 ARG GID=991
 ARG BINARY=pict-rs
+ARG BUILD_MODE=release
 
 COPY --from=builder \
- /opt/build/repo/target/x86_64-unknown-linux-musl/release/$BINARY \
+ /opt/build/pict-rs/target/x86_64-unknown-linux-musl/$BUILD_MODE/$BINARY \
  /usr/local/bin/$BINARY
 
 RUN \
diff --git a/docker/prod/Dockerfile.arm32v7 b/docker/prod/Dockerfile.arm32v7
index ac5d3c9..b1dfcb1 100644
--- a/docker/prod/Dockerfile.arm32v7
+++ b/docker/prod/Dockerfile.arm32v7
@@ -59,7 +59,7 @@ RUN \
 WORKDIR /opt/build/pict-rs
 
 RUN \
- USER=build cargo build --release --target $TARGET --$BUILD_MODE && \
+ USER=build cargo build --target $TARGET --$BUILD_MODE && \
  $TOOL-strip target/$TARGET/$BUILD_MODE/$BINARY
 
 # production environment
@@ -68,9 +68,10 @@ FROM amd64/alpine:3.14
 ARG UID=991
 ARG GID=991
 ARG BINARY=pict-rs
+ARG BUILD_MODE=release
 
 COPY --from=builder \
- /opt/build/repo/target/arm-unknown-linux-musleabihf/release/$BINARY \
+ /opt/build/pict-rs/target/arm-unknown-linux-musleabihf/$BUILD_MODE/$BINARY \
  /usr/local/bin/$BINARY
 
 RUN \
diff --git a/docker/prod/Dockerfile.arm64v8 b/docker/prod/Dockerfile.arm64v8
index 6994ca1..54f854c 100644
--- a/docker/prod/Dockerfile.arm64v8
+++ b/docker/prod/Dockerfile.arm64v8
@@ -68,9 +68,10 @@ FROM amd64/alpine:3.14
 ARG UID=991
 ARG GID=991
 ARG BINARY=pict-rs
+ARG BUILD_MODE=release
 
 COPY --from=builder \
- /opt/build/repo/target/aarch64-unknown-linux-musl/release/$BINARY \
+ /opt/build/pict-rs/target/aarch64-unknown-linux-musl/$BUILD_MODE/$BINARY \
  /usr/local/bin/$BINARY
 
 RUN \
diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml
index cfae8e2..4bb2790 100644
--- a/docker/prod/docker-compose.yml
+++ b/docker/prod/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3.3'
 
 services:
   pictrs:
-    image: asonix/pictrs:v0.3.0-alpha.13-shell-out
+    image: asonix/pictrs:v0.3.0-alpha.13-shell-out-r0
     ports:
       - "127.0.0.1:8080:8080"
     restart: always