diff --git a/README.md b/README.md index 8379a59..c255b7b 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ _a simple image hosting service_ ## Usage ### Running ``` -pict-rs 0.3.0-alpha.5 +pict-rs 0.3.0-alpha.8 USAGE: pict-rs [FLAGS] [OPTIONS] --path @@ -59,7 +59,9 @@ $ wget https://git.asonix.dog/asonix/pict-rs/raw/branch/master/docker/prod/docke $ sudo docker-compose up -d ``` ###### Note -pict-rs makes use of the system's temporary folder. This is generally `/tmp` on linux +- pict-rs makes use of the system's temporary folder. This is generally `/tmp` on linux +- pict-rs makes use of a default imagemagick security policy at + `/usr/local/lib/ImageMagick-$VERSION/config-Q16HDRI/policy.xml` #### Docker Development The development system loads a rust environment inside a docker container with the neccessary diff --git a/docker/dev/root/usr/local/lib/ImageMagick-7.0.11/config-Q16HDRI/policy.xml b/docker/dev/root/usr/local/lib/ImageMagick-7.0.11/config-Q16HDRI/policy.xml new file mode 100644 index 0000000..141b546 --- /dev/null +++ b/docker/dev/root/usr/local/lib/ImageMagick-7.0.11/config-Q16HDRI/policy.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docker/prod/Dockerfile.amd64 b/docker/prod/Dockerfile.amd64 index f42223a..f668588 100644 --- a/docker/prod/Dockerfile.amd64 +++ b/docker/prod/Dockerfile.amd64 @@ -219,6 +219,8 @@ ENV \ RUN \ chown pictrs:pictrs /mnt +COPY root/ / + VOLUME /mnt WORKDIR /opt/pict-rs USER pictrs diff --git a/docker/prod/Dockerfile.arm32v7 b/docker/prod/Dockerfile.arm32v7 index a286d2d..d4209da 100644 --- a/docker/prod/Dockerfile.arm32v7 +++ b/docker/prod/Dockerfile.arm32v7 @@ -220,6 +220,8 @@ ENV \ RUN \ chown pictrs:pictrs /mnt +COPY root/ / + VOLUME /mnt WORKDIR /opt/pict-rs USER pictrs diff --git a/docker/prod/Dockerfile.arm64v8 b/docker/prod/Dockerfile.arm64v8 index ca13625..931fdd2 100644 --- a/docker/prod/Dockerfile.arm64v8 +++ b/docker/prod/Dockerfile.arm64v8 @@ -220,6 +220,8 @@ ENV \ RUN \ chown pictrs:pictrs /mnt +COPY root/ / + VOLUME /mnt WORKDIR /opt/pict-rs USER pictrs diff --git a/docker/prod/root/usr/local/lib/ImageMagick-7.0.11/config-Q16HDRI/policy.xml b/docker/prod/root/usr/local/lib/ImageMagick-7.0.11/config-Q16HDRI/policy.xml new file mode 100644 index 0000000..141b546 --- /dev/null +++ b/docker/prod/root/usr/local/lib/ImageMagick-7.0.11/config-Q16HDRI/policy.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + +