Isomorphic docker (#1124)

[lemmy.git] / docker / dev / docker-compose.yml

diff --git a/docker/dev/docker-compose.yml b/docker/dev/docker-compose.yml
index 3c52d1e54b28160f34c5e286240e16c7e6b20e4b..3269d5e86f6da257cb93293fe49b0dfd19ce75d3 100644 (file)
--- a/docker/dev/docker-compose.yml
+++ b/docker/dev/docker-compose.yml
@@ -1,44 +1,57 @@
 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: 
-      context: ../../
-      dockerfile: docker/dev/Dockerfile
+    image: lemmy-dev:latest
     ports:
-      - "127.0.0.1:8536:8536"
+      - "8536:8536"
     restart: always
     environment:
       - RUST_LOG=debug
     volumes:
       - ../lemmy.hjson:/config/config.hjson
     depends_on: 
+      - pictrs
       - postgres
-      - pictshare
       - iframely
+  lemmy-ui:
+    image: dessalines/lemmy-ui:v0.0.14
+    ports:
+      - "1235:1234"
+    environment:
+      - LEMMY_INTERNAL_HOST=lemmy:8536
+      - LEMMY_EXTERNAL_HOST=localhost:8536
+      - LEMMY_HTTPS=false
+    depends_on: 
+      - lemmy
 
-  pictshare:
-    image: shtripok/pictshare:latest
+  postgres:
+    image: postgres:12-alpine
     ports:
-      - "127.0.0.1:8537:80"
+      # use a different port so it doesnt conflict with postgres running on the host
+      - "5433:5432"
+    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: 
+      - "8537:8080"
+    user: 991:991
     volumes:
-      - ./volumes/pictshare:/usr/share/nginx/html/data
+      - ./volumes/pictrs:/mnt
     restart: always
 
   iframely:
     image: dogbin/iframely:latest
     ports:
-      - "127.0.0.1:8061:80"
+      - "8061:80"
     volumes:
       - ../iframely.config.local.js:/iframely/config.local.js:ro
     restart: always