Use pictrs instead of pictshare

2 files changed, 64 insertions, 18 deletions

diff --git a/docker/dev/docker-compose.yml b/docker/dev/docker-compose.yml
index 1702f66d..6c0624c4 100644
--- a/docker/dev/docker-compose.yml
+++ b/docker/dev/docker-compose.yml
@@ -1,22 +1,22 @@
 version: '3.3'
 
 services:
-  postgres:
-    image: postgres:12-alpine
-    environment:
-      - POSTGRES_USER=lemmy
-      - POSTGRES_PASSWORD=password
-      - POSTGRES_DB=lemmy
+  nginx:
+    image: nginx:1.19-alpine
+    ports:
+      - "8536:8536"
     volumes:
-      - ./volumes/postgres:/var/lib/postgresql/data
-    restart: always
+      - ./nginx.conf:/etc/nginx/nginx.conf
+    depends_on:
+      - lemmy
+      - pictrs
+      - iframely
+    restart: "always"
 
   lemmy:
     build: 
       context: ../../
       dockerfile: docker/dev/Dockerfile
-    ports:
-      - "127.0.0.1:8536:8536"
     restart: always
     environment:
       - RUST_LOG=debug
@@ -24,21 +24,27 @@ services:
       - ../lemmy.hjson:/config/config.hjson
     depends_on: 
       - 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/pictshare:/usr/share/nginx/html/data
+      - ./volumes/postgres:/var/lib/postgresql/data
+    restart: always
+
+  pictrs:
+    image: asonix/pictrs:amd64-v0.1.0-r9
+    user: 991:991
+    volumes:
+      - ./volumes/pictrs:/mnt
     restart: always
 
   iframely:
     image: dogbin/iframely:latest
-    ports:
-      - "127.0.0.1:8061:80"
     volumes:
       - ../iframely.config.local.js:/iframely/config.local.js:ro
     restart: always
diff --git a/docker/dev/nginx.conf b/docker/dev/nginx.conf
new file mode 100644
index 00000000..3e4ff510
--- /dev/null
+++ b/docker/dev/nginx.conf
@@ -0,0 +1,40 @@
+events {
+    worker_connections 1024;
+}
+
+http {
+    server {
+        listen 8536;
+        server_name 127.0.0.1;
+        #access_log  off;
+
+        # Upload limit for pictshare
+        client_max_body_size 50M;
+
+        location / {
+            proxy_pass http://lemmy:8536;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header Host $host;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+
+            # WebSocket support
+            proxy_http_version 1.1;
+            proxy_set_header Upgrade $http_upgrade;
+            proxy_set_header Connection "upgrade";
+        }
+
+        location /pictrs/ {
+            proxy_pass http://pictrs:8080/;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header Host $host;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        }
+
+        location /iframely/ {
+            proxy_pass http://iframely:80/;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header Host $host;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        }
+    }
+}