Add console-subscriber (#2003)

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

diff --git a/docker/dev/docker-compose.yml b/docker/dev/docker-compose.yml
index 4f95d528b58e173b49ef79be8ec288d0d7e3a18a..9e05bca5a6e226c038809ecd5f0cf159982fa14d 100644 (file)
--- a/docker/dev/docker-compose.yml
+++ b/docker/dev/docker-compose.yml
@@ -1,29 +1,38 @@
 version: '3.3'
 
 services:
+  nginx:
+    image: nginx:1-alpine
+    ports:
+      - "1236:1236"
+    volumes:
+      - ./nginx.conf:/etc/nginx/nginx.conf
+    restart: always
+    depends_on:
+      - pictrs
+      - lemmy-ui
 
   lemmy:
     image: lemmy-dev:latest
     ports:
       - "8536:8536"
+      - "6669:6669"
     restart: always
     environment:
-      - RUST_LOG=debug
+      - RUST_LOG="warn,lemmy_server=debug,lemmy_api=debug,lemmy_api_common=debug,lemmy_api_crud=debug,lemmy_apub=debug,lemmy_db_schema=debug,lemmy_db_views=debug,lemmy_db_views_actor=debug,lemmy_db_views_moderator=debug,lemmy_routes=debug,lemmy_utils=debug,lemmy_websocket=debug"
     volumes:
       - ../lemmy.hjson:/config/config.hjson
     depends_on: 
       - pictrs
       - postgres
-      - iframely
+      - otel
 
   lemmy-ui:
-    image: dessalines/lemmy-ui:0.10.0-rc.9
-    ports:
-      - "1235:1234"
+    image: dessalines/lemmy-ui:0.14.3
     restart: always
     environment:
       - LEMMY_INTERNAL_HOST=lemmy:8536
-      - LEMMY_EXTERNAL_HOST=localhost:8536
+      - LEMMY_EXTERNAL_HOST=localhost:1234
       - LEMMY_HTTPS=false
     depends_on: 
       - lemmy
@@ -42,19 +51,35 @@ services:
     restart: always
 
   pictrs:
-    image: asonix/pictrs:v0.2.6-r1
-    ports: 
-      - "8537:8080"
+    image: asonix/pictrs:0.3.0-beta.12-r1
     user: 991:991
+    environment:
+      - PICTRS_OPENTELEMETRY_URL=http://otel:4137
+    ports:
+      - "6670:6669"
     volumes:
       - ./volumes/pictrs:/mnt
     restart: always
+    depends_on:
+      - otel
 
-  iframely:
-    image: dogbin/iframely:latest
+  otel:
+    image: otel/opentelemetry-collector:latest
+    command: --config otel-local-config.yaml
     ports:
-      - "8061:80"
+      - "4317:4317"
     volumes:
-      - ../iframely.config.local.js:/iframely/config.local.js:ro
+      - type: bind
+        source: ./otel.yml
+        target: /otel-local-config.yaml
+    restart: always
+    depends_on:
+      - jaeger
+
+  jaeger:
+    image: jaegertracing/all-in-one:1
+    ports:
+      - "14250:14250"
+      # To view traces, visit http://localhost:16686
+      - "16686:16686"
     restart: always
-    mem_limit: 200m