Update Docker Compose files to use consolidated Dockerfile
- Replace references to separate `php/Dockerfile` and `web/Dockerfile` with the unified `docker/Dockerfile`. - Adjust target stages across services for development and production environments.
This commit is contained in:
2 files changed
+20
-19
No files matched your search
@@ -3,8 +3,9 @@ services:
|
|||||||
web:
|
web:
|
||||||
build:
|
build:
|
||||||
context: app
|
context: app
|
||||||
dockerfile: docker/web/Dockerfile
|
dockerfile: docker/Dockerfile
|
||||||
target: DEVELOP
|
target: WEB_PRODUCTION
|
||||||
|
# restart: always
|
||||||
depends_on:
|
depends_on:
|
||||||
- app
|
- app
|
||||||
ports:
|
ports:
|
||||||
@@ -21,8 +22,8 @@ services:
|
|||||||
app:
|
app:
|
||||||
build:
|
build:
|
||||||
context: app
|
context: app
|
||||||
dockerfile: docker/php/Dockerfile
|
dockerfile: docker/Dockerfile
|
||||||
target: PRODUCTION
|
target: APP_PRODUCTION
|
||||||
# restart: always
|
# restart: always
|
||||||
depends_on:
|
depends_on:
|
||||||
- db
|
- db
|
||||||
@@ -37,8 +38,8 @@ services:
|
|||||||
queue:
|
queue:
|
||||||
build:
|
build:
|
||||||
context: app
|
context: app
|
||||||
dockerfile: docker/php/Dockerfile
|
dockerfile: docker/Dockerfile
|
||||||
target: PRODUCTION
|
target: APP_PRODUCTION
|
||||||
# restart: always
|
# restart: always
|
||||||
depends_on:
|
depends_on:
|
||||||
- app
|
- app
|
||||||
@@ -52,8 +53,8 @@ services:
|
|||||||
scheduler:
|
scheduler:
|
||||||
build:
|
build:
|
||||||
context: app
|
context: app
|
||||||
dockerfile: docker/php/Dockerfile
|
dockerfile: docker/Dockerfile
|
||||||
target: PRODUCTION
|
target: APP_PRODUCTION
|
||||||
# restart: always
|
# restart: always
|
||||||
depends_on:
|
depends_on:
|
||||||
- app
|
- app
|
||||||
|
|||||||
+11
-11
@@ -3,8 +3,8 @@ services:
|
|||||||
web:
|
web:
|
||||||
build:
|
build:
|
||||||
context: app
|
context: app
|
||||||
dockerfile: docker/web/Dockerfile
|
dockerfile: docker/Dockerfile
|
||||||
target: DEVELOP
|
target: WEB_DEVELOP
|
||||||
depends_on:
|
depends_on:
|
||||||
- app
|
- app
|
||||||
ports:
|
ports:
|
||||||
@@ -21,8 +21,8 @@ services:
|
|||||||
app:
|
app:
|
||||||
build:
|
build:
|
||||||
context: app
|
context: app
|
||||||
dockerfile: docker/php/Dockerfile
|
dockerfile: docker/Dockerfile
|
||||||
target: DEVELOP
|
target: APP_DEVELOP
|
||||||
depends_on:
|
depends_on:
|
||||||
- db
|
- db
|
||||||
- app-redis
|
- app-redis
|
||||||
@@ -36,8 +36,8 @@ services:
|
|||||||
queue:
|
queue:
|
||||||
build:
|
build:
|
||||||
context: app
|
context: app
|
||||||
dockerfile: docker/php/Dockerfile
|
dockerfile: docker/Dockerfile
|
||||||
target: DEVELOP
|
target: APP_DEVELOP
|
||||||
depends_on:
|
depends_on:
|
||||||
- db
|
- db
|
||||||
- app
|
- app
|
||||||
@@ -50,8 +50,8 @@ services:
|
|||||||
scheduler:
|
scheduler:
|
||||||
build:
|
build:
|
||||||
context: app
|
context: app
|
||||||
dockerfile: docker/php/Dockerfile
|
dockerfile: docker/Dockerfile
|
||||||
target: DEVELOP
|
target: APP_DEVELOP
|
||||||
depends_on:
|
depends_on:
|
||||||
- db
|
- db
|
||||||
- app
|
- app
|
||||||
@@ -146,7 +146,7 @@ services:
|
|||||||
artisan:
|
artisan:
|
||||||
build:
|
build:
|
||||||
context: app
|
context: app
|
||||||
dockerfile: docker/php/Dockerfile
|
dockerfile: docker/Dockerfile
|
||||||
target: ARTISAN
|
target: ARTISAN
|
||||||
user: "${UID}:${GID}"
|
user: "${UID}:${GID}"
|
||||||
volumes:
|
volumes:
|
||||||
@@ -155,7 +155,7 @@ services:
|
|||||||
composer:
|
composer:
|
||||||
build:
|
build:
|
||||||
context: app
|
context: app
|
||||||
dockerfile: docker/php/Dockerfile
|
dockerfile: docker/Dockerfile
|
||||||
target: COMPOSER
|
target: COMPOSER
|
||||||
user: "${UID}:${GID}"
|
user: "${UID}:${GID}"
|
||||||
volumes:
|
volumes:
|
||||||
@@ -164,7 +164,7 @@ services:
|
|||||||
npm:
|
npm:
|
||||||
build:
|
build:
|
||||||
context: app
|
context: app
|
||||||
dockerfile: docker/php/Dockerfile
|
dockerfile: docker/Dockerfile
|
||||||
target: NPM
|
target: NPM
|
||||||
user: "${UID}:${GID}"
|
user: "${UID}:${GID}"
|
||||||
volumes:
|
volumes:
|
||||||
|
|||||||
Reference in new issue
Block a user