Merge branch 'server' of http://192.168.0.105:3000/ArenosWebDev/arenos_www into server

2025-08-30 10:21:42 +02:00 · 2025-08-30 10:21:42 +02:00 · ab50d6c3b9
commit ab50d6c3b9
parent 6b7522d444 3c884c29a3
1 changed files with 2 additions and 5 deletions
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -7,9 +7,6 @@ services:
    ports:
      - "2000:80"
    volumes:
-<<<<<<< Updated upstream
-      - /srv/arenos-landing/html:/srv:ro
-=======
    - /srv/arenos_www/html:/srv:ro
->>>>>>> Stashed changes
+
    command: ["caddy","file-server","--root","/srv","--listen",":80"]