2
0
Fork 0
mirror of https://git.asonix.dog/asonix/pict-rs synced 2024-11-10 06:25:00 +00:00

Version v0.2.0-alpha.2-r2

This commit is contained in:
asonix 2020-06-28 17:19:55 -05:00
parent cc37f0dd8a
commit 7dd23396a0
5 changed files with 19 additions and 5 deletions

View file

@ -213,7 +213,11 @@ RUN \
COPY --from=pict-rs-builder /opt/build/pict-rs/target/$TARGET/$BUILD_MODE/pict-rs /usr/local/bin/pict-rs COPY --from=pict-rs-builder /opt/build/pict-rs/target/$TARGET/$BUILD_MODE/pict-rs /usr/local/bin/pict-rs
COPY --from=imagemagick-builder /usr/local /usr/local COPY --from=imagemagick-builder /usr/local /usr/local
ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib ENV \
LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
RUN \
chown pictrs:pictrs /mnt
VOLUME /mnt VOLUME /mnt
WORKDIR /opt/pict-rs WORKDIR /opt/pict-rs

View file

@ -214,7 +214,11 @@ RUN \
COPY --from=pict-rs-builder /opt/build/pict-rs/target/$TARGET/$BUILD_MODE/pict-rs /usr/local/bin/pict-rs COPY --from=pict-rs-builder /opt/build/pict-rs/target/$TARGET/$BUILD_MODE/pict-rs /usr/local/bin/pict-rs
COPY --from=imagemagick-builder /usr/local /usr/local COPY --from=imagemagick-builder /usr/local /usr/local
ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib ENV \
LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
RUN \
chown pictrs:pictrs /mnt
VOLUME /mnt VOLUME /mnt
WORKDIR /opt/pict-rs WORKDIR /opt/pict-rs

View file

@ -214,7 +214,11 @@ RUN \
COPY --from=pict-rs-builder /opt/build/pict-rs/target/$TARGET/$BUILD_MODE/pict-rs /usr/local/bin/pict-rs COPY --from=pict-rs-builder /opt/build/pict-rs/target/$TARGET/$BUILD_MODE/pict-rs /usr/local/bin/pict-rs
COPY --from=imagemagick-builder /usr/local /usr/local COPY --from=imagemagick-builder /usr/local /usr/local
ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib ENV \
LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
RUN \
chown pictrs:pictrs /mnt
VOLUME /mnt VOLUME /mnt
WORKDIR /opt/pict-rs WORKDIR /opt/pict-rs

View file

@ -12,7 +12,7 @@ function print_help() {
echo "deploy.sh" echo "deploy.sh"
echo "" echo ""
echo "Usage:" echo "Usage:"
echo " deploy.sh [tag]" echo " deploy.sh [tag] [branch]"
echo "" echo ""
echo "Args:" echo "Args:"
echo " tag: The git tag to be applied to the repository and docker build" echo " tag: The git tag to be applied to the repository and docker build"
@ -25,6 +25,8 @@ function build_image() {
./build-image.sh asonix/pictrs $tag $arch ./build-image.sh asonix/pictrs $tag $arch
docker tag asonix/pictrs:$arch-$tag asonix/pictrs:$arch-latest
docker push asonix/pictrs:$arch-$tag docker push asonix/pictrs:$arch-$tag
docker push asonix/pictrs:$arch-latest docker push asonix/pictrs:$arch-latest
} }

View file

@ -2,7 +2,7 @@ version: '3.3'
services: services:
pictrs: pictrs:
image: asonix/pictrs:v0.2.0-alpha.2-r1 image: asonix/pictrs:v0.2.0-alpha.2-r2
ports: ports:
- "127.0.0.1:8080:8080" - "127.0.0.1:8080:8080"
restart: always restart: always