Move pict-rs binary out of excluded docker dir

This commit is contained in:
Aode (lion) 2021-12-03 19:41:12 -06:00
parent 39bd0fa04d
commit cd66a1478a
2 changed files with 6 additions and 5 deletions

View File

@ -123,6 +123,7 @@ steps:
commands: commands:
- cargo build --target=$TARGET --release - cargo build --target=$TARGET --release
- $TOOL-strip target/$TARGET/release/pict-rs - $TOOL-strip target/$TARGET/release/pict-rs
- cp target/$TARGET/release/pict-rs .
- name: push - name: push
image: plugins/docker image: plugins/docker
@ -201,6 +202,7 @@ steps:
commands: commands:
- cargo build --target=$TARGET --release - cargo build --target=$TARGET --release
- $TOOL-strip target/$TARGET/release/pict-rs - $TOOL-strip target/$TARGET/release/pict-rs
- cp target/$TARGET/release/pict-rs .
- name: push - name: push
image: plugins/docker image: plugins/docker
@ -279,6 +281,7 @@ steps:
commands: commands:
- cargo build --target=$TARGET --release - cargo build --target=$TARGET --release
- $TOOL-strip target/$TARGET/release/pict-rs - $TOOL-strip target/$TARGET/release/pict-rs
- cp target/$TARGET/release/pict-rs .
- name: push - name: push
image: plugins/docker image: plugins/docker

View File

@ -4,12 +4,10 @@ FROM asonix/rust-runner:$REPO_ARCH-latest
USER root USER root
RUN \ RUN \
apk add exiftool imagemagick ffmpeg && \ apk add exiftool imagemagick ffmpeg && \
chown -R app:app /mnt chown -R app:app /mnt
ARG TARGET_ARCH COPY pict-rs /usr/local/bin/pict-rs
COPY target/$TARGET_ARCH/release/pict-rs /usr/local/bin/pict-rs
COPY docker/prod/root/ / COPY docker/prod/root/ /
USER app USER app