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 2072024f34c9a5e0e3f56587f5088f8fae5c5b97..3269d5e86f6da257cb93293fe49b0dfd19ce75d3 100644 (file)
--- a/docker/dev/docker-compose.yml
+++ b/docker/dev/docker-compose.yml
@@ -3,22 +3,34 @@ version: '3.3'
 services:
 
   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
       - 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
 
   postgres:
     image: postgres:12-alpine
+    ports:
+      # use a different port so it doesnt conflict with postgres running on the host
+      - "5433:5432"
     environment:
       - POSTGRES_USER=lemmy
       - POSTGRES_PASSWORD=password
@@ -28,9 +40,9 @@ services:
     restart: always
 
   pictrs:
-    image: asonix/pictrs:v0.1.4-r0
+    image: asonix/pictrs:v0.1.13-r0
     ports: 
-      - "127.0.0.1:8537:8080"
+      - "8537:8080"
     user: 991:991
     volumes:
       - ./volumes/pictrs:/mnt
@@ -39,7 +51,7 @@ services:
   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