Hotfix: Solve merge conflicts on docker compose files.

wafflestudio · Apr 6, 2024 · ea055d2 · ea055d2
1 parent 97b6f98
commit ea055d2
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 6 deletions.
diff --git a/docker-compose-backend.yml b/docker-compose-backend.yml
@@ -1,7 +1,5 @@
 services:
     green:
-        env_file:
-            - .env_server
         container_name: csereal_server_green
         ports:
             - 8080:8080

diff --git a/docker-compose-caddy.yml b/docker-compose-caddy.yml
@@ -1,7 +1,5 @@
 services:
   caddy:
-    env_file:
-        -   .env_proxy
     container_name: csereal_caddy
     image: caddy:2.7.4-alpine
     ports:

diff --git a/docker-compose-db.yml b/docker-compose-db.yml
@@ -1,7 +1,5 @@
 services:
   db:
-    env_file:
-        - .env_db
     container_name: csereal_db_container
     image: mysql:8.0
     ports: