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 b4daff61c5f395ce1baedac561d783497a5f1d9d..3269d5e86f6da257cb93293fe49b0dfd19ce75d3 100644 (file)
--- a/docker/dev/docker-compose.yml
+++ b/docker/dev/docker-compose.yml
@@ -1,34 +1,57 @@
-version: '2.4'
+version: '3.3'
 
 services:
-  lemmy_db:
-    image: postgres:12-alpine
+
+  lemmy:
+    image: lemmy-dev:latest
+    ports:
+      - "8536:8536"
     restart: always
     environment:
-      POSTGRES_USER: rrr
-      POSTGRES_PASSWORD: rrr
-      POSTGRES_DB: rrr
+      - RUST_LOG=debug
     volumes:
-      - lemmy_db:/var/lib/postgresql/data
-    healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U rrr"]
-      interval: 5s
-      timeout: 5s
-      retries: 20
-  lemmy:
-    build: 
-      context: ../../
-      dockerfile: docker/dev/Dockerfile
+      - ../lemmy.hjson:/config/config.hjson
+    depends_on: 
+      - pictrs
+      - postgres
+      - iframely
+  lemmy-ui:
+    image: dessalines/lemmy-ui:v0.0.14
     ports:
-      - "8536:8536"
+      - "1235:1234"
     environment:
-      LEMMY_FRONT_END_DIR: /app/dist
-      DATABASE_URL: postgres://rrr:rrr@lemmy_db:5432/rrr
-      JWT_SECRET: changeme
-      HOSTNAME: rrr
-    restart: always
+      - LEMMY_INTERNAL_HOST=lemmy:8536
+      - LEMMY_EXTERNAL_HOST=localhost:8536
+      - LEMMY_HTTPS=false
     depends_on: 
-      lemmy_db: 
-        condition: service_healthy 
-volumes:
-  lemmy_db:
+      - 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
+      - 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/pictrs:/mnt
+    restart: always
+
+  iframely:
+    image: dogbin/iframely:latest
+    ports:
+      - "8061:80"
+    volumes:
+      - ../iframely.config.local.js:/iframely/config.local.js:ro
+    restart: always