diff --git a/.docker/docker-compose/docker-compose.local.yml b/.docker/docker-compose/docker-compose.local.yml index d97a780dc..981a187dc 100644 --- a/.docker/docker-compose/docker-compose.local.yml +++ b/.docker/docker-compose/docker-compose.local.yml @@ -86,7 +86,7 @@ services: security_opt: - "seccomp=unconfined" volumes: - - ${APP_CODE_PATH_HOST?}:${APP_CODE_PATH_CONTAINER?} + - ${APPLICATION_CODE_PATH_HOST?}:${APPLICATION_CODE_PATH_CONTAINER?} ports: - "${APPLICATION_SSH_HOST_PORT:-2222}:22" - "${APPLICATION_PANTHER_HOST_PORT:-9001}:9001" diff --git a/.make/01-application-setup.mk b/.make/01-application-setup.mk index ee02fe01f..8736a61d1 100644 --- a/.make/01-application-setup.mk +++ b/.make/01-application-setup.mk @@ -2,7 +2,7 @@ .PHONY: setup setup: ## Setup the application - "$(MAKE)" composer ARGS="--working-dir=/data/www/new install" + "$(MAKE)" composer ARGS="--working-dir=/application/src/new install" "$(MAKE)" setup-db .PHONY: setup-db diff --git a/.make/04-docker.mk b/.make/04-docker.mk index 53eaf4724..011d56705 100644 --- a/.make/04-docker.mk +++ b/.make/04-docker.mk @@ -75,7 +75,7 @@ ifndef EXECUTE_IN_CONTAINER endif ifeq ($(EXECUTE_IN_CONTAINER),true) EXECUTE_IN_ANY_CONTAINER:=$(DOCKER_COMPOSE) exec $(DOCKER_COMPOSE_EXEC_OPTIONS) --user $(APP_USER_NAME) $(DOCKER_SERVICE_NAME) - EXECUTE_IN_APPLICATION_CONTAINER:=$(DOCKER_COMPOSE) exec $(DOCKER_COMPOSE_EXEC_OPTIONS) --user $(APP_USER_NAME) -w /data/www/new $(DOCKER_SERVICE_NAME_APPLICATION) + EXECUTE_IN_APPLICATION_CONTAINER:=$(DOCKER_COMPOSE) exec $(DOCKER_COMPOSE_EXEC_OPTIONS) --user $(APP_USER_NAME) -w /application/src/new $(DOCKER_SERVICE_NAME_APPLICATION) EXECUTE_IN_CRON_CONTAINER:=$(DOCKER_COMPOSE) exec $(DOCKER_COMPOSE_EXEC_OPTIONS) --user $(APP_USER_NAME) $(DOCKER_SERVICE_NAME_PHP_CRON) endif diff --git a/.make/05-symfony.mk b/.make/05-symfony.mk index 161ffafe5..ac0c95099 100644 --- a/.make/05-symfony.mk +++ b/.make/05-symfony.mk @@ -2,4 +2,4 @@ .PHONY: console console: ## Run composer commands. Specify the command e.g. via ARGS="install" - $(EXECUTE_IN_APPLICATION_CONTAINER) php "/data/www/new/bin/console" $(ARGS); \ No newline at end of file + $(EXECUTE_IN_APPLICATION_CONTAINER) php "/application/src/new/bin/console" $(ARGS);