Add dynamic COMPOSE_PROJECT_NAME and container naming conventions to CI workflows
- Updated `tests.yml` to set `COMPOSE_PROJECT_NAME` dynamically based on `github.run_id` and `github.run_attempt`. - Updated `docker-compose.ci.yml` to use dynamic container names with `COMPOSE_PROJECT_NAME`.
This commit is contained in:
@@ -1,5 +1,15 @@
|
||||
services:
|
||||
traefik:
|
||||
container_name: "${COMPOSE_PROJECT_NAME:-api}-traefik"
|
||||
|
||||
redis:
|
||||
container_name: "${COMPOSE_PROJECT_NAME:-api}-redis"
|
||||
|
||||
mysql-debug:
|
||||
container_name: "${COMPOSE_PROJECT_NAME:-api}-mysql-debug"
|
||||
|
||||
edge-broker:
|
||||
container_name: "${COMPOSE_PROJECT_NAME:-api}-edge-broker"
|
||||
labels:
|
||||
- "traefik.http.routers.edge-broker-local-ci.rule=PathPrefix(`/api/edge-broker`)"
|
||||
- "traefik.http.routers.edge-broker-local-ci.entrypoints=web"
|
||||
@@ -8,6 +18,7 @@ services:
|
||||
- "traefik.http.routers.edge-broker-local-ci.service=edge-broker"
|
||||
|
||||
caddy:
|
||||
container_name: "${COMPOSE_PROJECT_NAME:-api}-caddy"
|
||||
labels:
|
||||
- "traefik.http.routers.local-api-ci.rule=PathPrefix(`/api`)"
|
||||
- "traefik.http.routers.local-api-ci.entrypoints=web"
|
||||
@@ -18,24 +29,29 @@ services:
|
||||
- ci_php_app:/var/www/html
|
||||
|
||||
php1:
|
||||
container_name: "${COMPOSE_PROJECT_NAME:-api}-php1"
|
||||
environment:
|
||||
AUTO_COMPOSER_INSTALL: "false"
|
||||
volumes:
|
||||
- ci_php_app:/var/www/html
|
||||
|
||||
php2:
|
||||
container_name: "${COMPOSE_PROJECT_NAME:-api}-php2"
|
||||
volumes:
|
||||
- ci_php_app:/var/www/html
|
||||
|
||||
php3:
|
||||
container_name: "${COMPOSE_PROJECT_NAME:-api}-php3"
|
||||
volumes:
|
||||
- ci_php_app:/var/www/html
|
||||
|
||||
php4:
|
||||
container_name: "${COMPOSE_PROJECT_NAME:-api}-php4"
|
||||
volumes:
|
||||
- ci_php_app:/var/www/html
|
||||
|
||||
php5:
|
||||
container_name: "${COMPOSE_PROJECT_NAME:-api}-php5"
|
||||
volumes:
|
||||
- ci_php_app:/var/www/html
|
||||
|
||||
|
||||
@@ -142,6 +142,7 @@ jobs:
|
||||
runs-on: [self-hosted, Linux, X64, default]
|
||||
env:
|
||||
COMPOSE_FILE: docker-compose.yml:.github/docker-compose.ci.yml
|
||||
COMPOSE_PROJECT_NAME: edge-gateway-backend-${{ github.run_id }}-${{ github.run_attempt }}
|
||||
TRAEFIK_WEB_PORT: "18080"
|
||||
TRAEFIK_WEBSECURE_PORT: "18443"
|
||||
TRAEFIK_WEBSECURE_STAGING_PORT: "18433"
|
||||
@@ -239,6 +240,11 @@ jobs:
|
||||
--name "$runner" \
|
||||
--network "${compose_project}_default" \
|
||||
-e COMPOSE_FILE="$COMPOSE_FILE" \
|
||||
-e COMPOSE_PROJECT_NAME="$compose_project" \
|
||||
-e TRAEFIK_WEB_PORT="${TRAEFIK_WEB_PORT:-18080}" \
|
||||
-e TRAEFIK_WEBSECURE_PORT="${TRAEFIK_WEBSECURE_PORT:-18443}" \
|
||||
-e TRAEFIK_WEBSECURE_STAGING_PORT="${TRAEFIK_WEBSECURE_STAGING_PORT:-18433}" \
|
||||
-e TRAEFIK_METRICS_PORT="${TRAEFIK_METRICS_PORT:-19100}" \
|
||||
-e EDGE_GATEWAY_E2E_BASE_URL="http://caddy" \
|
||||
-e EDGE_GATEWAY_E2E_COMPOSE_PROJECT="$compose_project" \
|
||||
-e EDGE_GATEWAY_E2E_COPY_CONFIG="true" \
|
||||
|
||||
Reference in New Issue
Block a user