From cd66a1478a0b3eec37de95e2c8bfeb06aec704e6 Mon Sep 17 00:00:00 2001 From: "Aode (lion)" Date: Fri, 3 Dec 2021 19:41:12 -0600 Subject: [PATCH] Move pict-rs binary out of excluded docker dir --- .drone.yml | 3 +++ docker/drone/Dockerfile | 8 +++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.drone.yml b/.drone.yml index ac33b31..7a256c5 100644 --- a/.drone.yml +++ b/.drone.yml @@ -123,6 +123,7 @@ steps: commands: - cargo build --target=$TARGET --release - $TOOL-strip target/$TARGET/release/pict-rs + - cp target/$TARGET/release/pict-rs . - name: push image: plugins/docker @@ -201,6 +202,7 @@ steps: commands: - cargo build --target=$TARGET --release - $TOOL-strip target/$TARGET/release/pict-rs + - cp target/$TARGET/release/pict-rs . - name: push image: plugins/docker @@ -279,6 +281,7 @@ steps: commands: - cargo build --target=$TARGET --release - $TOOL-strip target/$TARGET/release/pict-rs + - cp target/$TARGET/release/pict-rs . - name: push image: plugins/docker diff --git a/docker/drone/Dockerfile b/docker/drone/Dockerfile index 52e9839..027d80d 100644 --- a/docker/drone/Dockerfile +++ b/docker/drone/Dockerfile @@ -4,12 +4,10 @@ FROM asonix/rust-runner:$REPO_ARCH-latest USER root RUN \ - apk add exiftool imagemagick ffmpeg && \ - chown -R app:app /mnt + apk add exiftool imagemagick ffmpeg && \ + chown -R app:app /mnt -ARG TARGET_ARCH - -COPY target/$TARGET_ARCH/release/pict-rs /usr/local/bin/pict-rs +COPY pict-rs /usr/local/bin/pict-rs COPY docker/prod/root/ / USER app