Merge branch 'api-platform:main' into Devcontainer

api-platform · Aug 1, 2023 · c95ae9e · c95ae9e
2 parents 34c2a0f + 3714ef8
commit c95ae9e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
@@ -32,6 +32,7 @@ services:
       WATCHPACK_POLLING: "true"
 
   caddy:
+    command: [ "caddy", "run", "--config", "/etc/caddy/Caddyfile", "--watch" ]
     build:
       context: api/
       target: caddy_base

diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
@@ -17,7 +17,7 @@ services:
 
   caddy:
     build:
-      context: api/
+      context: ./api/
       target: caddy_prod
     environment:
       MERCURE_PUBLISHER_JWT_KEY: ${CADDY_MERCURE_JWT_SECRET}

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3.4"
 
 services:
   php:
-    image: app-php
+    image: ${IMAGES_PREFIX:-}app-php
     depends_on:
       - database
     restart: unless-stopped
@@ -22,12 +22,12 @@ services:
       MERCURE_JWT_SECRET: ${CADDY_MERCURE_JWT_SECRET:-!ChangeThisMercureHubJWTSecretKey!}
 
   pwa:
-    image: app-pwa
+    image: ${IMAGES_PREFIX:-}app-pwa
     environment:
       NEXT_PUBLIC_ENTRYPOINT: http://caddy
 
   caddy:
-    image: app-caddy
+    image: ${IMAGES_PREFIX:-}app-caddy
     depends_on:
       - php
       - pwa