This commit is contained in:
Thomas Peterson 2025-01-03 20:00:56 +01:00
parent 4a584295ee
commit 6d7f485e9c
4 changed files with 4 additions and 4 deletions

View File

@ -86,7 +86,7 @@ services:
security_opt: security_opt:
- "seccomp=unconfined" - "seccomp=unconfined"
volumes: volumes:
- ${APP_CODE_PATH_HOST?}:${APP_CODE_PATH_CONTAINER?} - ${APPLICATION_CODE_PATH_HOST?}:${APPLICATION_CODE_PATH_CONTAINER?}
ports: ports:
- "${APPLICATION_SSH_HOST_PORT:-2222}:22" - "${APPLICATION_SSH_HOST_PORT:-2222}:22"
- "${APPLICATION_PANTHER_HOST_PORT:-9001}:9001" - "${APPLICATION_PANTHER_HOST_PORT:-9001}:9001"

View File

@ -2,7 +2,7 @@
.PHONY: setup .PHONY: setup
setup: ## Setup the application 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 "$(MAKE)" setup-db
.PHONY: setup-db .PHONY: setup-db

View File

@ -75,7 +75,7 @@ ifndef EXECUTE_IN_CONTAINER
endif endif
ifeq ($(EXECUTE_IN_CONTAINER),true) 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_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) EXECUTE_IN_CRON_CONTAINER:=$(DOCKER_COMPOSE) exec $(DOCKER_COMPOSE_EXEC_OPTIONS) --user $(APP_USER_NAME) $(DOCKER_SERVICE_NAME_PHP_CRON)
endif endif

View File

@ -2,4 +2,4 @@
.PHONY: console .PHONY: console
console: ## Run composer commands. Specify the command e.g. via ARGS="install" console: ## Run composer commands. Specify the command e.g. via ARGS="install"
$(EXECUTE_IN_APPLICATION_CONTAINER) php "/data/www/new/bin/console" $(ARGS); $(EXECUTE_IN_APPLICATION_CONTAINER) php "/application/src/new/bin/console" $(ARGS);