Merge branch 'master' into federation_merge_from_master_2

14 files changed, 218 insertions, 330 deletions

diff --git a/docker/dev/Dockerfile b/docker/dev/Dockerfile
index d9ffc2f3..82a03f3c 100644
--- a/docker/dev/Dockerfile
+++ b/docker/dev/Dockerfile
@@ -21,17 +21,13 @@ COPY server/Cargo.toml server/Cargo.lock ./
 RUN sudo chown -R rust:rust .
 RUN mkdir -p ./src/bin \
   && echo 'fn main() { println!("Dummy") }' > ./src/bin/main.rs 
-RUN cargo build --release
+RUN cargo build
 RUN rm -f ./target/x86_64-unknown-linux-musl/release/deps/lemmy_server*
 COPY server/src ./src/
 COPY server/migrations ./migrations/
 
-# Build for release
-RUN cargo build --frozen --release
-
-# Get diesel-cli on there just in case
-# RUN cargo install diesel_cli --no-default-features --features postgres
-
+# Build for debug
+RUN cargo build
 
 FROM ekidd/rust-musl-builder:1.42.0-openssl11 as docs
 WORKDIR /app
@@ -39,15 +35,14 @@ COPY docs ./docs
 RUN sudo chown -R rust:rust .
 RUN mdbook build docs/
 
-
-FROM alpine:3.10
+FROM alpine:3.12
 
 # Install libpq for postgres
 RUN apk add libpq
 
 # Copy resources
 COPY server/config/defaults.hjson /config/defaults.hjson
-COPY --from=rust /app/server/target/x86_64-unknown-linux-musl/release/lemmy_server /app/lemmy
+COPY --from=rust /app/server/target/x86_64-unknown-linux-musl/debug/lemmy_server /app/lemmy
 COPY --from=docs /app/docs/book/ /app/dist/documentation/
 COPY --from=node /app/ui/dist /app/dist
 
diff --git a/docker/dev/Dockerfile.aarch64 b/docker/dev/Dockerfile.aarch64
deleted file mode 100644
index 9636a590..00000000
--- a/docker/dev/Dockerfile.aarch64
+++ /dev/null
@@ -1,79 +0,0 @@
-FROM node:10-jessie as node
-
-WORKDIR /app/ui
-
-# Cache deps
-COPY ui/package.json ui/yarn.lock ./
-RUN yarn install --pure-lockfile
-
-# Build
-COPY ui /app/ui
-RUN yarn build
-
-
-# contains qemu-*-static for cross-compilation
-FROM multiarch/qemu-user-static as qemu
-
-
-FROM arm64v8/rust:1.40-buster as rust
-
-COPY --from=qemu /usr/bin/qemu-aarch64-static /usr/bin
-#COPY --from=qemu /usr/bin/qemu-arm-static /usr/bin
-
-
-# Install musl
-#RUN apt-get update && apt-get install -y mc
-#RUN apt-get install -y musl-tools mc
-#libpq-dev mc
-#RUN rustup target add ${TARGET}
-
-# Cache deps
-WORKDIR /app
-RUN USER=root cargo new server
-WORKDIR /app/server
-COPY server/Cargo.toml server/Cargo.lock ./
-RUN  mkdir -p ./src/bin \
-  && echo 'fn main() { println!("Dummy") }' > ./src/bin/main.rs
-RUN cargo build --release
-# RUN cargo build
-COPY server/src ./src/
-COPY server/migrations ./migrations/
-RUN rm -f ./target/release/deps/lemmy_server* ; rm -f ./target/debug/deps/lemmy_server*
-
-
-# build for release
-RUN cargo build --frozen --release
-# RUN cargo build --frozen
-
-# Get diesel-cli on there just in case
-# RUN cargo install diesel_cli --no-default-features --features postgres
-
-# RUN cp /app/server/target/debug/lemmy_server /app/server/ready
-RUN cp /app/server/target/release/lemmy_server /app/server/ready
-
-#FROM alpine:3.10
-# debian because build with dynamic linking with debian:buster
-FROM arm64v8/debian:buster-slim as lemmy
-
-#COPY --from=qemu /usr/bin/qemu-arm-static /usr/bin
-COPY --from=qemu /usr/bin/qemu-aarch64-static /usr/bin
-
-# Install libpq for postgres
-#RUN apk add libpq
-RUN apt-get update && apt-get install -y libpq5
-
-RUN addgroup --gid 1000 lemmy
-# for alpine
-#RUN adduser -D -s /bin/sh -u 1000 -G lemmy lemmy
-# for debian
-RUN adduser --disabled-password --shell /bin/sh --uid 1000 --ingroup lemmy lemmy
-
-# Copy resources
-COPY server/config/defaults.hjson /config/defaults.hjson
-COPY --from=rust /app/server/ready /app/lemmy
-COPY --from=node /app/ui/dist /app/dist
-
-RUN chown lemmy:lemmy /app/lemmy
-USER lemmy
-EXPOSE 8536
-CMD ["/app/lemmy"]
diff --git a/docker/dev/Dockerfile.armv7hf b/docker/dev/Dockerfile.armv7hf
deleted file mode 100644
index c2c9084c..00000000
--- a/docker/dev/Dockerfile.armv7hf
+++ /dev/null
@@ -1,79 +0,0 @@
-FROM node:10-jessie as node
-
-WORKDIR /app/ui
-
-# Cache deps
-COPY ui/package.json ui/yarn.lock ./
-RUN yarn install --pure-lockfile
-
-# Build
-COPY ui /app/ui
-RUN yarn build
-
-
-# contains qemu-*-static for cross-compilation
-FROM multiarch/qemu-user-static as qemu
-
-
-FROM arm32v7/rust:1.37-buster as rust
-
-#COPY --from=qemu /usr/bin/qemu-aarch64-static /usr/bin
-COPY --from=qemu /usr/bin/qemu-arm-static /usr/bin
-
-
-# Install musl
-#RUN apt-get update && apt-get install -y mc
-#RUN apt-get install -y musl-tools mc
-#libpq-dev mc
-#RUN rustup target add ${TARGET}
-
-# Cache deps
-WORKDIR /app
-RUN USER=root cargo new server
-WORKDIR /app/server
-COPY server/Cargo.toml server/Cargo.lock ./
-RUN  mkdir -p ./src/bin \
-  && echo 'fn main() { println!("Dummy") }' > ./src/bin/main.rs
-#RUN cargo build --release
-# RUN cargo build
-  RUN RUSTFLAGS='-Ccodegen-units=1' cargo build
-COPY server/src ./src/
-COPY server/migrations ./migrations/
-RUN rm -f ./target/release/deps/lemmy_server* ; rm -f ./target/debug/deps/lemmy_server*
-
-
-# build for release
-#RUN cargo build --frozen --release
-RUN cargo build --frozen
-
-# Get diesel-cli on there just in case
-# RUN cargo install diesel_cli --no-default-features --features postgres
-
-RUN cp /app/server/target/debug/lemmy_server /app/server/ready
-#RUN cp /app/server/target/release/lemmy_server /app/server/ready
-
-#FROM alpine:3.10
-# debian because build with dynamic linking with debian:buster
-FROM arm32v7/debian:buster-slim as lemmy
-
-COPY --from=qemu /usr/bin/qemu-arm-static /usr/bin
-
-# Install libpq for postgres
-#RUN apk add libpq
-RUN apt-get update && apt-get install -y libpq5
-
-RUN addgroup --gid 1000 lemmy
-# for alpine
-#RUN adduser -D -s /bin/sh -u 1000 -G lemmy lemmy
-# for debian
-RUN adduser --disabled-password --shell /bin/sh --uid 1000 --ingroup lemmy lemmy
-
-# Copy resources
-COPY server/config/defaults.hjson /config/defaults.hjson
-COPY --from=rust /app/server/ready /app/lemmy
-COPY --from=node /app/ui/dist /app/dist
-
-RUN chown lemmy:lemmy /app/lemmy
-USER lemmy
-EXPOSE 8536
-CMD ["/app/lemmy"]
diff --git a/docker/dev/Dockerfile.libc b/docker/dev/Dockerfile.libc
deleted file mode 100644
index 6348342f..00000000
--- a/docker/dev/Dockerfile.libc
+++ /dev/null
@@ -1,88 +0,0 @@
-# can be build on x64, arm32, arm64 platforms
-# to build on target platform run 
-# docker build -f Dockerfile.libc -t dessalines/lemmy:version ../..
-#
-# to use docker buildx run
-# docker buildx build --platform linux/amd64,linux/arm64 -f Dockerfile.libc -t YOURNAME/lemmy --push ../..
-
-FROM node:12-buster as node
-# use this if use docker buildx 
-#FROM --platform=$BUILDPLATFORM node:12-buster as node
-
-WORKDIR /app/ui
-
-# Cache deps
-COPY ui/package.json ui/yarn.lock ./
-RUN yarn install --pure-lockfile --network-timeout 100000
-
-# Build
-COPY ui /app/ui
-RUN yarn build
-
-
-FROM rust:1.42 as rust
-
-# Cache deps
-WORKDIR /app
-
-RUN USER=root cargo new server
-WORKDIR /app/server
-COPY server/Cargo.toml server/Cargo.lock ./
-RUN  mkdir -p ./src/bin \
-  && echo 'fn main() { println!("Dummy") }' > ./src/bin/main.rs
-
-
-RUN cargo build --release
-#RUN cargo build && \
-#    rm -f ./target/release/deps/lemmy_server* ; rm -f ./target/debug/deps/lemmy_server*
-COPY server/src ./src/
-COPY server/migrations ./migrations/
-
-
-# build for release
-# workaround for https://github.com/rust-lang/rust/issues/62896
-#RUN RUSTFLAGS='-Ccodegen-units=1' cargo build --release
-RUN cargo build --release --frozen
-#RUN cargo build --frozen
-
-# Get diesel-cli on there just in case
-# RUN cargo install diesel_cli --no-default-features --features postgres
-
-# make result place always the same for lemmy container
-RUN cp /app/server/target/release/lemmy_server /app/server/ready
-#RUN cp /app/server/target/debug/lemmy_server /app/server/ready
-
-
-FROM rust:1.42 as docs
-
-WORKDIR /app
-
-# Build docs
-COPY docs ./docs
-RUN cargo install mdbook
-RUN mdbook build docs/
-
-
-#FROM alpine:3.10
-# debian because build with dynamic linking with debian:buster
-FROM debian:buster as lemmy
-
-# Install libpq for postgres
-#RUN apk add libpq
-RUN apt-get update && apt-get install -y libpq5
-RUN addgroup --gid 1000 lemmy
-# for alpine
-#RUN adduser -D -s /bin/sh -u 1000 -G lemmy lemmy
-# for debian
-RUN adduser --disabled-password --shell /bin/sh --uid 1000 --ingroup lemmy lemmy
-
-# Copy resources
-COPY server/config/defaults.hjson /config/defaults.hjson
-COPY --from=node /app/ui/dist /app/dist
-COPY --from=docs /app/docs/book/ /app/dist/documentation/
-COPY --from=rust /app/server/ready /app/lemmy
-
-RUN chown lemmy:lemmy /app/lemmy
-USER lemmy
-EXPOSE 8536
-CMD ["/app/lemmy"]
diff --git a/docker/dev/docker-compose.yml b/docker/dev/docker-compose.yml
index 3fc94099..bdcb4308 100644
--- a/docker/dev/docker-compose.yml
+++ b/docker/dev/docker-compose.yml
@@ -1,15 +1,6 @@
 version: '3.3'
 
 services:
-  postgres:
-    image: postgres:12-alpine
-    environment:
-      - POSTGRES_USER=lemmy
-      - POSTGRES_PASSWORD=password
-      - POSTGRES_DB=lemmy
-    volumes:
-      - ./volumes/postgres:/var/lib/postgresql/data
-    restart: always
 
   lemmy:
     build: 
@@ -22,17 +13,28 @@ services:
       - RUST_LOG=debug
     volumes:
       - ../lemmy.hjson:/config/config.hjson
-    depends_on:
+    depends_on: 
+      - pictrs
       - postgres
-      - pictshare
       - iframely
 
-  pictshare:
-    image: hascheksolutions/pictshare:latest
-    ports:
-      - "127.0.0.1:8537:80"
+  postgres:
+    image: postgres:12-alpine
+    environment:
+      - POSTGRES_USER=lemmy
+      - POSTGRES_PASSWORD=password
+      - POSTGRES_DB=lemmy
+    volumes:
+      - ./volumes/postgres:/var/lib/postgresql/data
+    restart: always
+
+  pictrs:
+    image: asonix/pictrs:v0.1.13-r0
+    ports: 
+      - "127.0.0.1:8537:8080"
+    user: 991:991
     volumes:
-      - ./volumes/pictshare:/usr/share/nginx/html/data
+      - ./volumes/pictrs:/mnt
     restart: always
 
   iframely:
diff --git a/docker/dev/docker_update.sh b/docker/dev/docker_update.sh
index 9d0f4542..21e92ba8 100755
--- a/docker/dev/docker_update.sh
+++ b/docker/dev/docker_update.sh
@@ -1,2 +1,6 @@
 #!/bin/sh
+set -e
+
+export COMPOSE_DOCKER_CLI_BUILD=1
+export DOCKER_BUILDKIT=1
 docker-compose up -d --no-deps --build
diff --git a/docker/dev/test_deploy.sh b/docker/dev/test_deploy.sh
index fb09e4f1..c2ecc0c8 100755
--- a/docker/dev/test_deploy.sh
+++ b/docker/dev/test_deploy.sh
@@ -4,7 +4,9 @@ set -e
 BRANCH=$1
 
 git checkout $BRANCH
-cd ../../
+
+export COMPOSE_DOCKER_CLI_BUILD=1
+export DOCKER_BUILDKIT=1
 
 # Rebuilding dev docker
 sudo docker build . -f "docker/dev/Dockerfile" -t "dessalines/lemmy:$BRANCH"
diff --git a/docker/federation/docker-compose.yml b/docker/federation/docker-compose.yml
index 4379eb38..585f2b4b 100644
--- a/docker/federation/docker-compose.yml
+++ b/docker/federation/docker-compose.yml
@@ -12,11 +12,11 @@ services:
       - ../federation/nginx.conf:/etc/nginx/nginx.conf
     depends_on:
       - lemmy_alpha
-      - pictshare_alpha
+      - pictrs_alpha
       - lemmy_beta
-      - pictshare_beta
+      - pictrs_beta
       - lemmy_gamma
-      - pictshare_gamma
+      - pictrs_gamma
       - iframely
     restart: "always"
 
@@ -48,10 +48,11 @@ services:
     volumes:
       - ./volumes/postgres_alpha:/var/lib/postgresql/data
     restart: always
-  pictshare_alpha:
-    image: shtripok/pictshare:latest
+  pictrs_alpha:
+    image: asonix/pictrs:v0.1.13-r0
+    user: 991:991
     volumes:
-      - ./volumes/pictshare_alpha:/usr/share/nginx/html/data
+      - ./volumes/pictrs_alpha:/mnt
     restart: always
 
   lemmy_beta:
@@ -82,10 +83,11 @@ services:
     volumes:
       - ./volumes/postgres_beta:/var/lib/postgresql/data
     restart: always
-  pictshare_beta:
-    image: shtripok/pictshare:latest
+  pictrs_beta:
+    image: asonix/pictrs:v0.1.13-r0
+    user: 991:991
     volumes:
-      - ./volumes/pictshare_beta:/usr/share/nginx/html/data
+      - ./volumes/pictrs_beta:/mnt
     restart: always
 
   lemmy_gamma:
@@ -116,10 +118,11 @@ services:
     volumes:
       - ./volumes/postgres_gamma:/var/lib/postgresql/data
     restart: always
-  pictshare_gamma:
-    image: shtripok/pictshare:latest
+  pictrs_gamma:
+    image: asonix/pictrs:v0.1.13-r0
+    user: 991:991
     volumes:
-      - ./volumes/pictshare_gamma:/usr/share/nginx/html/data
+      - ./volumes/pictrs_gamma:/mnt
     restart: always
 
   iframely:
diff --git a/docker/federation/nginx.conf b/docker/federation/nginx.conf
index a73b0954..25160eb6 100644
--- a/docker/federation/nginx.conf
+++ b/docker/federation/nginx.conf
@@ -23,11 +23,16 @@ http {
             proxy_set_header Connection "upgrade";
         }
 
-        location /pictshare/ {
-            proxy_pass http://pictshare_alpha:80/;
+        # pict-rs images
+        location /pictrs {
+          location /pictrs/image {
+            proxy_pass http://pictrs_alpha:8080/image;
             proxy_set_header X-Real-IP $remote_addr;
             proxy_set_header Host $host;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+          }
+          # Block the import
+          return 403;
         }
 
         location /iframely/ {
@@ -58,11 +63,16 @@ http {
             proxy_set_header Connection "upgrade";
         }
 
-        location /pictshare/ {
-            proxy_pass http://pictshare_beta:80/;
+        # pict-rs images
+        location /pictrs {
+          location /pictrs/image {
+            proxy_pass http://pictrs_beta:8080/image;
             proxy_set_header X-Real-IP $remote_addr;
             proxy_set_header Host $host;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+          }
+          # Block the import
+          return 403;
         }
 
         location /iframely/ {
@@ -93,11 +103,16 @@ http {
             proxy_set_header Connection "upgrade";
         }
 
-        location /pictshare/ {
-            proxy_pass http://pictshare_gamma:80/;
+        # pict-rs images
+        location /pictrs {
+          location /pictrs/image {
+            proxy_pass http://pictrs_gamma:8080/image;
             proxy_set_header X-Real-IP $remote_addr;
             proxy_set_header Host $host;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+          }
+          # Block the import
+          return 403;
         }
 
         location /iframely/ {
diff --git a/docker/federation/run-federation-test.bash b/docker/federation/run-federation-test.bash
index 206a3240..bc73fff6 100755
--- a/docker/federation/run-federation-test.bash
+++ b/docker/federation/run-federation-test.bash
@@ -20,4 +20,9 @@ popd || exit
 
 sudo docker build ../../ --file Dockerfile -t lemmy-federation:latest
 
+for Item in alpha beta gamma ; do
+  sudo mkdir -p volumes/pictrs_$Item
+  sudo chown -R 991:991 volumes/pictrs_$Item
+done
+
 sudo docker-compose up
diff --git a/docker/prod/Dockerfile b/docker/prod/Dockerfile
new file mode 100644
index 00000000..54485a37
--- /dev/null
+++ b/docker/prod/Dockerfile
@@ -0,0 +1,64 @@
+ARG RUST_BUILDER_IMAGE=shtripok/rust-musl-builder:arm
+
+FROM $RUST_BUILDER_IMAGE as rust
+
+#ARG RUSTRELEASEDIR="debug"
+ARG RUSTRELEASEDIR="release"
+
+# Cache deps
+WORKDIR /app
+RUN sudo chown -R rust:rust .
+RUN USER=root cargo new server
+WORKDIR /app/server
+COPY --chown=rust:rust server/Cargo.toml server/Cargo.lock ./
+#RUN sudo chown -R rust:rust .
+RUN mkdir -p ./src/bin \
+   && echo 'fn main() { println!("Dummy") }' > ./src/bin/main.rs
+RUN cargo build --release
+RUN rm -f ./target/$CARGO_BUILD_TARGET/$RUSTRELEASEDIR/deps/lemmy_server*
+COPY --chown=rust:rust server/src ./src/
+COPY --chown=rust:rust server/migrations ./migrations/
+
+# build for release
+# workaround for https://github.com/rust-lang/rust/issues/62896
+RUN cargo build --frozen --release
+
+# reduce binary size
+RUN strip ./target/$CARGO_BUILD_TARGET/$RUSTRELEASEDIR/lemmy_server
+
+RUN cp ./target/$CARGO_BUILD_TARGET/$RUSTRELEASEDIR/lemmy_server /app/server/
+
+FROM $RUST_BUILDER_IMAGE as docs
+WORKDIR /app
+COPY --chown=rust:rust docs ./docs
+RUN mdbook build docs/
+
+FROM node:12-buster as node
+
+WORKDIR /app/ui
+
+# Cache deps
+COPY ui/package.json ui/yarn.lock ./
+RUN yarn install --pure-lockfile --network-timeout 600000
+
+# Build
+COPY ui /app/ui
+RUN yarn build
+
+FROM alpine:3.12 as lemmy
+
+# Install libpq for postgres
+RUN apk add libpq
+RUN addgroup -g 1000 lemmy
+RUN adduser -D -s /bin/sh -u 1000 -G lemmy lemmy
+
+# Copy resources
+COPY --chown=lemmy:lemmy server/config/defaults.hjson /config/defaults.hjson
+COPY --chown=lemmy:lemmy --from=rust /app/server/lemmy_server /app/lemmy
+COPY --chown=lemmy:lemmy --from=docs /app/docs/book/ /app/dist/documentation/
+COPY --chown=lemmy:lemmy --from=node /app/ui/dist /app/dist
+
+RUN chown lemmy:lemmy /app/lemmy
+USER lemmy
+EXPOSE 8536
+CMD ["/app/lemmy"]
diff --git a/docker/dev/deploy.sh b/docker/prod/deploy.sh
index 09b21b0b..2c6e3d31 100755
--- a/docker/dev/deploy.sh
+++ b/docker/prod/deploy.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+set -e
 git checkout master
 
 # Import translations
@@ -20,7 +21,7 @@ git add "server/src/version.rs"
 echo $new_tag > "ansible/VERSION"
 git add "ansible/VERSION"
 
-cd docker/dev || exit
+cd docker/prod || exit
 
 # Changing the docker-compose prod
 sed -i "s/dessalines\/lemmy:.*/dessalines\/lemmy:$new_tag/" ../prod/docker-compose.yml
@@ -32,41 +33,24 @@ git add ../../ansible/templates/docker-compose.yml
 git commit -m"Version $new_tag"
 git tag $new_tag
 
-# Rebuilding docker
-docker-compose build
-docker tag dev_lemmy:latest dessalines/lemmy:x64-$new_tag
-docker push dessalines/lemmy:x64-$new_tag
-
-# Build for Raspberry Pi / other archs
-
-# Arm currently not working
-# docker build -t lemmy:armv7hf -f Dockerfile.armv7hf ../../
-# docker tag lemmy:armv7hf dessalines/lemmy:armv7hf-$new_tag
-# docker push dessalines/lemmy:armv7hf-$new_tag
-
-# aarch64
-# Only do this on major releases (IE the third semver is 0)
-if [ $third_semver -eq 0 ]; then
-  # Registering qemu binaries
-  docker run --rm --privileged multiarch/qemu-user-static:register --reset
+export COMPOSE_DOCKER_CLI_BUILD=1
+export DOCKER_BUILDKIT=1
 
-  docker build -t lemmy:aarch64 -f Dockerfile.aarch64 ../../
-  docker tag lemmy:aarch64 dessalines/lemmy:arm64-$new_tag
-  docker push dessalines/lemmy:arm64-$new_tag
-fi
-
-# Creating the manifest for the multi-arch build
+# Rebuilding docker
 if [ $third_semver -eq 0 ]; then
-  docker manifest create dessalines/lemmy:$new_tag \
-  dessalines/lemmy:x64-$new_tag \
-  dessalines/lemmy:arm64-$new_tag
+  # TODO get linux/arm/v7 build working
+  # Build for Raspberry Pi / other archs too
+  docker buildx build --platform linux/amd64,linux/arm64 ../../ \
+    --file Dockerfile \
+    --tag dessalines/lemmy:$new_tag \
+    --push
 else
-  docker manifest create dessalines/lemmy:$new_tag \
-  dessalines/lemmy:x64-$new_tag
+  docker buildx build --platform linux/amd64 ../../ \
+    --file Dockerfile \
+    --tag dessalines/lemmy:$new_tag \
+    --push
 fi
 
-docker manifest push dessalines/lemmy:$new_tag
-
 # Push
 git push origin $new_tag
 git push
diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml
index db6e4004..e2774d64 100644
--- a/docker/prod/docker-compose.yml
+++ b/docker/prod/docker-compose.yml
@@ -12,7 +12,7 @@ services:
     restart: always
 
   lemmy:
-    image: dessalines/lemmy:v0.6.71
+    image: dessalines/lemmy:v0.7.0
     ports:
       - "127.0.0.1:8536:8536"
     restart: always
@@ -22,17 +22,17 @@ services:
       - ./lemmy.hjson:/config/config.hjson
     depends_on:
       - postgres
-      - pictshare
+      - pictrs
       - iframely
 
-  pictshare:
-    image: hascheksolutions/pictshare:latest
-    ports:
-      - "127.0.0.1:8537:80"
+  pictrs:
+    image: asonix/pictrs:v0.1.13-r0
+    ports: 
+      - "127.0.0.1:8537:8080"
+    user: 991:991
     volumes:
-      - ./volumes/pictshare:/usr/share/nginx/html/data
+      - ./volumes/pictrs:/mnt
     restart: always
-    mem_limit: 100m
 
   iframely:
     image: dogbin/iframely:latest
diff --git a/docker/prod/migrate-pictshare-to-pictrs.bash b/docker/prod/migrate-pictshare-to-pictrs.bash
new file mode 100644
index 00000000..8229eb28
--- /dev/null
+++ b/docker/prod/migrate-pictshare-to-pictrs.bash
@@ -0,0 +1,60 @@
+#!/bin/bash
+set -e
+
+if [[ $(id -u) != 0 ]]; then 
+    echo "This migration needs to be run as root"
+    exit
+fi
+
+if [[ ! -f docker-compose.yml ]]; then 
+    echo "No docker-compose.yml found in current directory. Is this the right folder?"
+    exit
+fi
+
+# Fixing pictrs permissions
+mkdir -p volumes/pictrs
+sudo chown -R 991:991 volumes/pictrs
+
+echo "Restarting docker-compose, making sure that pictrs is started and pictshare is removed"
+docker-compose up -d --remove-orphans
+
+if [[ -z $(docker-compose ps | grep pictrs) ]]; then
+    echo "Pict-rs is not running, make sure you update Lemmy first"
+    exit
+fi
+
+# echo "Stopping Lemmy so that users dont upload new images during the migration"
+# docker-compose stop lemmy
+
+pushd volumes/pictshare/
+echo "Importing pictshare images to pict-rs..."
+IMAGE_NAMES=*
+for image in $IMAGE_NAMES; do
+    IMAGE_PATH="$(pwd)/$image/$image"
+    if [[ ! -f $IMAGE_PATH ]]; then
+        continue
+    fi
+    echo -e "\nImporting $IMAGE_PATH"
+    ret=0
+    curl --silent --fail -F "images[]=@$IMAGE_PATH" http://127.0.0.1:8537/import || ret=$?
+    if [[ $ret != 0 ]]; then
+      echo "Error for $IMAGE_PATH : $ret"
+    fi
+done
+
+echo "Fixing permissions on pictshare folder"
+find . -type d -exec chmod 755 {} \;
+find . -type f -exec chmod 644 {} \;
+
+popd
+
+echo "Rewrite image links in Lemmy database"
+docker-compose exec -u  postgres postgres psql -U lemmy -c "UPDATE user_ SET avatar = REPLACE(avatar, 'pictshare', 'pictrs/image') WHERE avatar is not null;"
+docker-compose exec -u  postgres postgres psql -U lemmy -c "UPDATE post SET url = REPLACE(url, 'pictshare', 'pictrs/image') WHERE url is not null;"
+
+echo "Moving pictshare data folder to pictshare_backup"
+mv volumes/pictshare volumes/pictshare_backup
+
+echo "Migration done, starting Lemmy again"
+echo "If everything went well, you can delete ./volumes/pictshare_backup/"
+docker-compose start lemmy