Merge commit 'b5a2b4e6d1b958dbb3ad702026889172514c1fd6'

2025-05-08 01:36:25 -04:00
parent 1432d7aca1 b5a2b4e6d1
commit cf6b74ce7e
18 changed files with 599 additions and 567 deletions
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,10 +3,17 @@ services:
    build: .
    container_name: screw-bardo
    ports:
+<<<<<<< HEAD
      - "$PORT:1986"
    env_file:
      - .env
    volumes:
      - ./app/logs:/app/app/logs/:rw
    restart: unless-stopped
-  
+  
+=======
+      - "1986:1986"
+    volumes:
+      - ./app/logs:/app/logs
+    restart: unless-stopped
+>>>>>>> b5a2b4e6d1b958dbb3ad702026889172514c1fd6