Revert compose files

docker/compose.override.yaml

@@ -1,5 +1,3 @@
-version: '3.7'
-
 services:
   php:
     environment:
@@ -9,13 +7,10 @@ services:
     depends_on:
       - mailer
 
-###> symfony/mercure-bundle ###
-  mercure:
-    ports:
-      - "80"
-###< symfony/mercure-bundle ###
+  ###> doctrine/doctrine-bundle ###
+  ###< doctrine/doctrine-bundle ###
 
-###> symfony/mailer ###
+  ###> symfony/mailer ###
   mailer:
     image: axllent/mailpit
     ports:

docker/compose.yaml

@@ -3,8 +3,8 @@ version: '3.7'
 services:
   php:
     build:
-      context: ../
-      dockerfile: php/Dockerfile
+      context: ..
+      dockerfile: docker/php/Dockerfile
       args:
         USER_ID: ${USER_ID:-1000}
         GROUP_ID: ${GROUP_ID:-1000}
@@ -24,8 +24,8 @@ services:
 
   php-worker:
     build:
-      context: ../
-      dockerfile: php/Dockerfile
+      context: ..
+      dockerfile: docker/php/Dockerfile
       args:
         USER_ID: ${USER_ID:-1000}
         GROUP_ID: ${GROUP_ID:-1000}
@@ -96,7 +96,7 @@ services:
         ipv4_address: 172.20.0.14
     restart: unless-stopped
 
-###> doctrine/doctrine-bundle ###
+  ###> doctrine/doctrine-bundle ###
   database:
     image: mysql:8.0
     container_name: escapepage-db
@@ -125,6 +125,9 @@ services:
     restart: unless-stopped
 ###< doctrine/doctrine-bundle ###
 
+###> doctrine/doctrine-bundle ###
+###< doctrine/doctrine-bundle ###
+
 networks:
   backend:
     driver: bridge