diff --git a/production/scripts/docker-prod-common.sh b/production/scripts/docker-prod-common.sh index 569badf..72bbf2b 100755 --- a/production/scripts/docker-prod-common.sh +++ b/production/scripts/docker-prod-common.sh @@ -7,6 +7,7 @@ PROD_COMPOSE_FILE="${ROOT_DIR}/docker-compose.production.yml" TRAEFIK_COMPOSE_FILE="${ROOT_DIR}/traefik.yaml" ENV_FILE="${ROOT_DIR}/.env.docker.production" PROJECT_NAME="${DOCKER_PROD_PROJECT_NAME:-rentaldrivego-prod}" +TRAEFIK_PROJECT_NAME="${DOCKER_TRAEFIK_PROJECT_NAME:-rentaldrivego}" TRAEFIK_NETWORK="${DOCKER_PROD_TRAEFIK_NETWORK:-traefik-proxy}" VOLUME_BACKUP_IMAGE="${DOCKER_VOLUME_BACKUP_IMAGE:-postgres:16-alpine}" API_UPLOADS_VOLUME="${DOCKER_PROD_API_UPLOADS_VOLUME:-${PROJECT_NAME}_api_uploads}" @@ -251,7 +252,7 @@ prod_compose() { traefik_compose() { export_compose_env_from_file - docker compose --env-file "${ENV_FILE}" -f "${TRAEFIK_COMPOSE_FILE}" "$@" + docker compose -p "${TRAEFIK_PROJECT_NAME}" --env-file "${ENV_FILE}" -f "${TRAEFIK_COMPOSE_FILE}" "$@" } start_prod_services() { diff --git a/scripts/docker-prod-common.sh b/scripts/docker-prod-common.sh index 02c7079..d8472f1 100644 --- a/scripts/docker-prod-common.sh +++ b/scripts/docker-prod-common.sh @@ -11,6 +11,7 @@ ENV_FILE="${ROOT_DIR}/.env.docker.production" DYNAMIC_DIR="${ROOT_DIR}/dynamic" REGISTRY_DYNAMIC_FILE="${DYNAMIC_DIR}/registry-upstream.yml" PROJECT_NAME="${DOCKER_PROD_PROJECT_NAME:-rentaldrivego-prod}" +TRAEFIK_PROJECT_NAME="${DOCKER_TRAEFIK_PROJECT_NAME:-rentaldrivego}" PORTAINER_PROJECT_NAME="${DOCKER_PORTAINER_PROJECT_NAME:-rentaldrivego-portainer-prod}" REGISTRY_PROJECT_NAME="${DOCKER_REGISTRY_PROJECT_NAME:-rentaldrivego-registry-prod}" TRAEFIK_NETWORK="${DOCKER_PROD_TRAEFIK_NETWORK:-traefik-proxy}" @@ -264,7 +265,7 @@ registry_compose() { traefik_compose() { export_compose_env_from_file - docker compose --env-file "${ENV_FILE}" -f "${TRAEFIK_COMPOSE_FILE}" "$@" + docker compose -p "${TRAEFIK_PROJECT_NAME}" --env-file "${ENV_FILE}" -f "${TRAEFIK_COMPOSE_FILE}" "$@" } start_prod_services() {