diff --git a/examples/helix-basic-aspnetcore/docker-compose.override.yml b/examples/helix-basic-aspnetcore/docker-compose.override.yml index 33372f77..48908038 100644 --- a/examples/helix-basic-aspnetcore/docker-compose.override.yml +++ b/examples/helix-basic-aspnetcore/docker-compose.override.yml @@ -46,9 +46,9 @@ services: - cd labels: - "traefik.enable=true" - - "traefik.http.routers.rendering-secure.entrypoints=websecure" - - "traefik.http.routers.rendering-secure.rule=Host(`${RENDERING_HOST}`)" - - "traefik.http.routers.rendering-secure.tls=true" + - "traefik.http.routers.rendering-${COMPOSE_PROJECT_NAME}-secure.entrypoints=websecure" + - "traefik.http.routers.rendering-${COMPOSE_PROJECT_NAME}-secure.rule=Host(`${RENDERING_HOST}`)" + - "traefik.http.routers.rendering-${COMPOSE_PROJECT_NAME}-secure.tls=true" traefik: volumes: diff --git a/examples/helix-basic-aspnetcore/docker-compose.yml b/examples/helix-basic-aspnetcore/docker-compose.yml index 552cc17a..ce481730 100644 --- a/examples/helix-basic-aspnetcore/docker-compose.yml +++ b/examples/helix-basic-aspnetcore/docker-compose.yml @@ -37,8 +37,6 @@ services: SA_PASSWORD: ${SQL_SA_PASSWORD} SITECORE_ADMIN_PASSWORD: ${SITECORE_ADMIN_PASSWORD} ACCEPT_EULA: "Y" - ports: - - "14330:1433" volumes: - type: bind source: .\mssql-data @@ -46,8 +44,6 @@ services: solr: isolation: ${ISOLATION} image: ${SITECORE_DOCKER_REGISTRY}nonproduction/solr:8.4.0-${SITECORE_VERSION} - ports: - - "8984:8983" volumes: - type: bind source: .\solr-data @@ -83,9 +79,9 @@ services: condition: service_healthy labels: - "traefik.enable=true" - - "traefik.http.routers.id-secure.entrypoints=websecure" - - "traefik.http.routers.id-secure.rule=Host(`${ID_HOST}`)" - - "traefik.http.routers.id-secure.tls=true" + - "traefik.http.routers.id-${COMPOSE_PROJECT_NAME}-secure.entrypoints=websecure" + - "traefik.http.routers.id-${COMPOSE_PROJECT_NAME}-secure.rule=Host(`${ID_HOST}`)" + - "traefik.http.routers.id-${COMPOSE_PROJECT_NAME}-secure.tls=true" cd: isolation: ${ISOLATION} image: ${SITECORE_DOCKER_REGISTRY}sitecore-xm1-cd:${SITECORE_VERSION} @@ -111,9 +107,9 @@ services: timeout: 300s labels: - "traefik.enable=true" - - "traefik.http.routers.cd-secure.entrypoints=websecure" - - "traefik.http.routers.cd-secure.rule=Host(`${CD_HOST}`)" - - "traefik.http.routers.cd-secure.tls=true" + - "traefik.http.routers.cd-${COMPOSE_PROJECT_NAME}-secure.entrypoints=websecure" + - "traefik.http.routers.cd-${COMPOSE_PROJECT_NAME}-secure.rule=Host(`${CD_HOST}`)" + - "traefik.http.routers.cd-${COMPOSE_PROJECT_NAME}-secure.tls=true" cm: isolation: ${ISOLATION} image: ${SITECORE_DOCKER_REGISTRY}sitecore-xm1-cm:${SITECORE_VERSION} @@ -150,7 +146,7 @@ services: - "traefik.enable=true" - "traefik.http.middlewares.force-STS-Header.headers.forceSTSHeader=true" - "traefik.http.middlewares.force-STS-Header.headers.stsSeconds=31536000" - - "traefik.http.routers.cm-secure.entrypoints=websecure" - - "traefik.http.routers.cm-secure.rule=Host(`${CM_HOST}`)" - - "traefik.http.routers.cm-secure.tls=true" - - "traefik.http.routers.cm-secure.middlewares=force-STS-Header" + - "traefik.http.routers.cm-${COMPOSE_PROJECT_NAME}-secure.entrypoints=websecure" + - "traefik.http.routers.cm-${COMPOSE_PROJECT_NAME}-secure.rule=Host(`${CM_HOST}`)" + - "traefik.http.routers.cm-${COMPOSE_PROJECT_NAME}-secure.tls=true" + - "traefik.http.routers.cm-${COMPOSE_PROJECT_NAME}-secure.middlewares=force-STS-Header" diff --git a/examples/helix-basic-aspnetcore/up.ps1 b/examples/helix-basic-aspnetcore/up.ps1 index a2802c3c..3f1e7a7f 100644 --- a/examples/helix-basic-aspnetcore/up.ps1 +++ b/examples/helix-basic-aspnetcore/up.ps1 @@ -24,7 +24,12 @@ $startTime = Get-Date do { Start-Sleep -Milliseconds 100 try { - $status = Invoke-RestMethod "http://localhost:8079/api/http/routers/cm-secure@docker" + + #WORKAROUND: https://github.com/Sitecore/docker-tools/issues/38 + $envFileAbsolutePath = $(Get-Item -Path ".env").FullName + + $compose_project_name = Get-EnvFileVariable -Variable "COMPOSE_PROJECT_NAME" -Path $envFileAbsolutePath + $status = Invoke-RestMethod "http://localhost:8079/api/http/routers/cm-$compose_project_name-secure@docker" } catch { if ($_.Exception.Response.StatusCode.value__ -ne "404") { throw diff --git a/examples/helix-basic-nextjs/docker-compose.override.yml b/examples/helix-basic-nextjs/docker-compose.override.yml index d32e2d15..89fc5743 100644 --- a/examples/helix-basic-nextjs/docker-compose.override.yml +++ b/examples/helix-basic-nextjs/docker-compose.override.yml @@ -51,9 +51,9 @@ services: - nodejs labels: - "traefik.enable=true" - - "traefik.http.routers.rendering-secure.entrypoints=websecure" - - "traefik.http.routers.rendering-secure.rule=Host(`${RENDERING_HOST}`)" - - "traefik.http.routers.rendering-secure.tls=true" + - "traefik.http.routers.rendering-${COMPOSE_PROJECT_NAME}-secure.entrypoints=websecure" + - "traefik.http.routers.rendering-${COMPOSE_PROJECT_NAME}-secure.rule=Host(`${RENDERING_HOST}`)" + - "traefik.http.routers.rendering-${COMPOSE_PROJECT_NAME}-secure.tls=true" # Mount the Traefik configuration and certs. traefik: diff --git a/examples/helix-basic-nextjs/docker-compose.yml b/examples/helix-basic-nextjs/docker-compose.yml index fa2dfb10..5fe7f6e9 100644 --- a/examples/helix-basic-nextjs/docker-compose.yml +++ b/examples/helix-basic-nextjs/docker-compose.yml @@ -37,8 +37,6 @@ services: SA_PASSWORD: ${SQL_SA_PASSWORD} SITECORE_ADMIN_PASSWORD: ${SITECORE_ADMIN_PASSWORD} ACCEPT_EULA: "Y" - ports: - - "14330:1433" volumes: - type: bind source: .\mssql-data @@ -46,8 +44,6 @@ services: solr: isolation: ${ISOLATION} image: ${SITECORE_DOCKER_REGISTRY}nonproduction/solr:8.4.0-${SITECORE_VERSION} - ports: - - "8984:8983" volumes: - type: bind source: .\solr-data @@ -83,9 +79,9 @@ services: condition: service_healthy labels: - "traefik.enable=true" - - "traefik.http.routers.id-secure.entrypoints=websecure" - - "traefik.http.routers.id-secure.rule=Host(`${ID_HOST}`)" - - "traefik.http.routers.id-secure.tls=true" + - "traefik.http.routers.id-${COMPOSE_PROJECT_NAME}-secure.entrypoints=websecure" + - "traefik.http.routers.id-${COMPOSE_PROJECT_NAME}-secure.rule=Host(`${ID_HOST}`)" + - "traefik.http.routers.id-${COMPOSE_PROJECT_NAME}-secure.tls=true" cd: isolation: ${ISOLATION} image: ${SITECORE_DOCKER_REGISTRY}sitecore-xm1-cd:${SITECORE_VERSION} @@ -111,9 +107,9 @@ services: timeout: 300s labels: - "traefik.enable=true" - - "traefik.http.routers.cd-secure.entrypoints=websecure" - - "traefik.http.routers.cd-secure.rule=Host(`${CD_HOST}`)" - - "traefik.http.routers.cd-secure.tls=true" + - "traefik.http.routers.cd-${COMPOSE_PROJECT_NAME}-secure.entrypoints=websecure" + - "traefik.http.routers.cd-${COMPOSE_PROJECT_NAME}-secure.rule=Host(`${CD_HOST}`)" + - "traefik.http.routers.cd-${COMPOSE_PROJECT_NAME}-secure.tls=true" cm: isolation: ${ISOLATION} image: ${SITECORE_DOCKER_REGISTRY}sitecore-xm1-cm:${SITECORE_VERSION} @@ -150,7 +146,7 @@ services: - "traefik.enable=true" - "traefik.http.middlewares.force-STS-Header.headers.forceSTSHeader=true" - "traefik.http.middlewares.force-STS-Header.headers.stsSeconds=31536000" - - "traefik.http.routers.cm-secure.entrypoints=websecure" - - "traefik.http.routers.cm-secure.rule=Host(`${CM_HOST}`)" - - "traefik.http.routers.cm-secure.tls=true" - - "traefik.http.routers.cm-secure.middlewares=force-STS-Header" \ No newline at end of file + - "traefik.http.routers.cm-${COMPOSE_PROJECT_NAME}-secure.entrypoints=websecure" + - "traefik.http.routers.cm-${COMPOSE_PROJECT_NAME}-secure.rule=Host(`${CM_HOST}`)" + - "traefik.http.routers.cm-${COMPOSE_PROJECT_NAME}-secure.tls=true" + - "traefik.http.routers.cm-${COMPOSE_PROJECT_NAME}-secure.middlewares=force-STS-Header" \ No newline at end of file diff --git a/examples/helix-basic-nextjs/up.ps1 b/examples/helix-basic-nextjs/up.ps1 index c01aa26d..3a640d8a 100644 --- a/examples/helix-basic-nextjs/up.ps1 +++ b/examples/helix-basic-nextjs/up.ps1 @@ -24,7 +24,12 @@ $startTime = Get-Date do { Start-Sleep -Milliseconds 100 try { - $status = Invoke-RestMethod "http://localhost:8079/api/http/routers/cm-secure@docker" + + #WORKAROUND: https://github.com/Sitecore/docker-tools/issues/38 + $envFileAbsolutePath = $(Get-Item -Path ".env").FullName + + $compose_project_name = Get-EnvFileVariable -Variable "COMPOSE_PROJECT_NAME" -Path $envFileAbsolutePath + $status = Invoke-RestMethod "http://localhost:8079/api/http/routers/cm-$compose_project_name-secure@docker" } catch { if ($_.Exception.Response.StatusCode.value__ -ne "404") { throw diff --git a/examples/helix-basic-tds-consolidated/docker-compose.override.yml b/examples/helix-basic-tds-consolidated/docker-compose.override.yml index 2e98abc3..d7782039 100644 --- a/examples/helix-basic-tds-consolidated/docker-compose.override.yml +++ b/examples/helix-basic-tds-consolidated/docker-compose.override.yml @@ -80,7 +80,7 @@ services: SITECORE_DEVELOPMENT_PATCHES: DevEnvOn,CustomErrorsOff,DebugOn,DiagnosticsOff,InitMessagesOff entrypoint: powershell -Command "& C:\tools\entrypoints\iis\Development.ps1" labels: - - "traefik.http.routers.cd-secure.rule=Host(`${SITE_HOST}`) || Host(`${CD_HOST}`)" + - "traefik.http.routers.cd-${COMPOSE_PROJECT_NAME}-secure.rule=Host(`${SITE_HOST}`) || Host(`${CD_HOST}`)" cm: image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-xm1-cm:${VERSION:-latest} diff --git a/examples/helix-basic-tds-consolidated/docker-compose.yml b/examples/helix-basic-tds-consolidated/docker-compose.yml index 9ae077a8..ce481730 100644 --- a/examples/helix-basic-tds-consolidated/docker-compose.yml +++ b/examples/helix-basic-tds-consolidated/docker-compose.yml @@ -37,16 +37,12 @@ services: SA_PASSWORD: ${SQL_SA_PASSWORD} SITECORE_ADMIN_PASSWORD: ${SITECORE_ADMIN_PASSWORD} ACCEPT_EULA: "Y" - ports: - - "14330:1433" volumes: - type: bind source: .\mssql-data target: c:\data solr: isolation: ${ISOLATION} - ports: - - "8984:8983" image: ${SITECORE_DOCKER_REGISTRY}nonproduction/solr:8.4.0-${SITECORE_VERSION} volumes: - type: bind @@ -83,9 +79,9 @@ services: condition: service_healthy labels: - "traefik.enable=true" - - "traefik.http.routers.id-secure.entrypoints=websecure" - - "traefik.http.routers.id-secure.rule=Host(`${ID_HOST}`)" - - "traefik.http.routers.id-secure.tls=true" + - "traefik.http.routers.id-${COMPOSE_PROJECT_NAME}-secure.entrypoints=websecure" + - "traefik.http.routers.id-${COMPOSE_PROJECT_NAME}-secure.rule=Host(`${ID_HOST}`)" + - "traefik.http.routers.id-${COMPOSE_PROJECT_NAME}-secure.tls=true" cd: isolation: ${ISOLATION} image: ${SITECORE_DOCKER_REGISTRY}sitecore-xm1-cd:${SITECORE_VERSION} @@ -111,9 +107,9 @@ services: timeout: 300s labels: - "traefik.enable=true" - - "traefik.http.routers.cd-secure.entrypoints=websecure" - - "traefik.http.routers.cd-secure.rule=Host(`${CD_HOST}`)" - - "traefik.http.routers.cd-secure.tls=true" + - "traefik.http.routers.cd-${COMPOSE_PROJECT_NAME}-secure.entrypoints=websecure" + - "traefik.http.routers.cd-${COMPOSE_PROJECT_NAME}-secure.rule=Host(`${CD_HOST}`)" + - "traefik.http.routers.cd-${COMPOSE_PROJECT_NAME}-secure.tls=true" cm: isolation: ${ISOLATION} image: ${SITECORE_DOCKER_REGISTRY}sitecore-xm1-cm:${SITECORE_VERSION} @@ -150,7 +146,7 @@ services: - "traefik.enable=true" - "traefik.http.middlewares.force-STS-Header.headers.forceSTSHeader=true" - "traefik.http.middlewares.force-STS-Header.headers.stsSeconds=31536000" - - "traefik.http.routers.cm-secure.entrypoints=websecure" - - "traefik.http.routers.cm-secure.rule=Host(`${CM_HOST}`)" - - "traefik.http.routers.cm-secure.tls=true" - - "traefik.http.routers.cm-secure.middlewares=force-STS-Header" + - "traefik.http.routers.cm-${COMPOSE_PROJECT_NAME}-secure.entrypoints=websecure" + - "traefik.http.routers.cm-${COMPOSE_PROJECT_NAME}-secure.rule=Host(`${CM_HOST}`)" + - "traefik.http.routers.cm-${COMPOSE_PROJECT_NAME}-secure.tls=true" + - "traefik.http.routers.cm-${COMPOSE_PROJECT_NAME}-secure.middlewares=force-STS-Header" diff --git a/examples/helix-basic-tds/docker-compose.override.yml b/examples/helix-basic-tds/docker-compose.override.yml index fed27f6b..b42d6ef2 100644 --- a/examples/helix-basic-tds/docker-compose.override.yml +++ b/examples/helix-basic-tds/docker-compose.override.yml @@ -79,7 +79,7 @@ services: SITECORE_DEVELOPMENT_PATCHES: DevEnvOn,CustomErrorsOff,DebugOn,DiagnosticsOff,InitMessagesOff entrypoint: powershell -Command "& C:\tools\entrypoints\iis\Development.ps1" labels: - - "traefik.http.routers.cd-secure.rule=Host(`${SITE_HOST}`) || Host(`${CD_HOST}`)" + - "traefik.http.routers.cd-${COMPOSE_PROJECT_NAME}-secure.rule=Host(`${SITE_HOST}`) || Host(`${CD_HOST}`)" cm: image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-xm1-cm:${VERSION:-latest} diff --git a/examples/helix-basic-tds/docker-compose.yml b/examples/helix-basic-tds/docker-compose.yml index 9ae077a8..ce481730 100644 --- a/examples/helix-basic-tds/docker-compose.yml +++ b/examples/helix-basic-tds/docker-compose.yml @@ -37,16 +37,12 @@ services: SA_PASSWORD: ${SQL_SA_PASSWORD} SITECORE_ADMIN_PASSWORD: ${SITECORE_ADMIN_PASSWORD} ACCEPT_EULA: "Y" - ports: - - "14330:1433" volumes: - type: bind source: .\mssql-data target: c:\data solr: isolation: ${ISOLATION} - ports: - - "8984:8983" image: ${SITECORE_DOCKER_REGISTRY}nonproduction/solr:8.4.0-${SITECORE_VERSION} volumes: - type: bind @@ -83,9 +79,9 @@ services: condition: service_healthy labels: - "traefik.enable=true" - - "traefik.http.routers.id-secure.entrypoints=websecure" - - "traefik.http.routers.id-secure.rule=Host(`${ID_HOST}`)" - - "traefik.http.routers.id-secure.tls=true" + - "traefik.http.routers.id-${COMPOSE_PROJECT_NAME}-secure.entrypoints=websecure" + - "traefik.http.routers.id-${COMPOSE_PROJECT_NAME}-secure.rule=Host(`${ID_HOST}`)" + - "traefik.http.routers.id-${COMPOSE_PROJECT_NAME}-secure.tls=true" cd: isolation: ${ISOLATION} image: ${SITECORE_DOCKER_REGISTRY}sitecore-xm1-cd:${SITECORE_VERSION} @@ -111,9 +107,9 @@ services: timeout: 300s labels: - "traefik.enable=true" - - "traefik.http.routers.cd-secure.entrypoints=websecure" - - "traefik.http.routers.cd-secure.rule=Host(`${CD_HOST}`)" - - "traefik.http.routers.cd-secure.tls=true" + - "traefik.http.routers.cd-${COMPOSE_PROJECT_NAME}-secure.entrypoints=websecure" + - "traefik.http.routers.cd-${COMPOSE_PROJECT_NAME}-secure.rule=Host(`${CD_HOST}`)" + - "traefik.http.routers.cd-${COMPOSE_PROJECT_NAME}-secure.tls=true" cm: isolation: ${ISOLATION} image: ${SITECORE_DOCKER_REGISTRY}sitecore-xm1-cm:${SITECORE_VERSION} @@ -150,7 +146,7 @@ services: - "traefik.enable=true" - "traefik.http.middlewares.force-STS-Header.headers.forceSTSHeader=true" - "traefik.http.middlewares.force-STS-Header.headers.stsSeconds=31536000" - - "traefik.http.routers.cm-secure.entrypoints=websecure" - - "traefik.http.routers.cm-secure.rule=Host(`${CM_HOST}`)" - - "traefik.http.routers.cm-secure.tls=true" - - "traefik.http.routers.cm-secure.middlewares=force-STS-Header" + - "traefik.http.routers.cm-${COMPOSE_PROJECT_NAME}-secure.entrypoints=websecure" + - "traefik.http.routers.cm-${COMPOSE_PROJECT_NAME}-secure.rule=Host(`${CM_HOST}`)" + - "traefik.http.routers.cm-${COMPOSE_PROJECT_NAME}-secure.tls=true" + - "traefik.http.routers.cm-${COMPOSE_PROJECT_NAME}-secure.middlewares=force-STS-Header" diff --git a/examples/helix-basic-unicorn/docker-compose.override.yml b/examples/helix-basic-unicorn/docker-compose.override.yml index fb7b9393..9b266863 100644 --- a/examples/helix-basic-unicorn/docker-compose.override.yml +++ b/examples/helix-basic-unicorn/docker-compose.override.yml @@ -76,7 +76,7 @@ services: SITECORE_DEVELOPMENT_PATCHES: CustomErrorsOff entrypoint: powershell -Command "& C:\tools\entrypoints\iis\Development.ps1" labels: - - "traefik.http.routers.cd-secure.rule=Host(`${SITE_HOST}`) || Host(`${CD_HOST}`)" + - "traefik.http.routers.cd-${COMPOSE_PROJECT_NAME}-secure.rule=Host(`${SITE_HOST}`) || Host(`${CD_HOST}`)" cm: image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-xm1-cm:${VERSION:-latest} diff --git a/examples/helix-basic-unicorn/docker-compose.yml b/examples/helix-basic-unicorn/docker-compose.yml index 9ae077a8..7735bce1 100644 --- a/examples/helix-basic-unicorn/docker-compose.yml +++ b/examples/helix-basic-unicorn/docker-compose.yml @@ -36,17 +36,13 @@ services: environment: SA_PASSWORD: ${SQL_SA_PASSWORD} SITECORE_ADMIN_PASSWORD: ${SITECORE_ADMIN_PASSWORD} - ACCEPT_EULA: "Y" - ports: - - "14330:1433" + ACCEPT_EULA: "Y" volumes: - type: bind source: .\mssql-data target: c:\data solr: isolation: ${ISOLATION} - ports: - - "8984:8983" image: ${SITECORE_DOCKER_REGISTRY}nonproduction/solr:8.4.0-${SITECORE_VERSION} volumes: - type: bind @@ -83,9 +79,9 @@ services: condition: service_healthy labels: - "traefik.enable=true" - - "traefik.http.routers.id-secure.entrypoints=websecure" - - "traefik.http.routers.id-secure.rule=Host(`${ID_HOST}`)" - - "traefik.http.routers.id-secure.tls=true" + - "traefik.http.routers.id-${COMPOSE_PROJECT_NAME}-secure.entrypoints=websecure" + - "traefik.http.routers.id-${COMPOSE_PROJECT_NAME}-secure.rule=Host(`${ID_HOST}`)" + - "traefik.http.routers.id-${COMPOSE_PROJECT_NAME}-secure.tls=true" cd: isolation: ${ISOLATION} image: ${SITECORE_DOCKER_REGISTRY}sitecore-xm1-cd:${SITECORE_VERSION} @@ -111,9 +107,9 @@ services: timeout: 300s labels: - "traefik.enable=true" - - "traefik.http.routers.cd-secure.entrypoints=websecure" - - "traefik.http.routers.cd-secure.rule=Host(`${CD_HOST}`)" - - "traefik.http.routers.cd-secure.tls=true" + - "traefik.http.routers.cd-${COMPOSE_PROJECT_NAME}-secure.entrypoints=websecure" + - "traefik.http.routers.cd-${COMPOSE_PROJECT_NAME}-secure.rule=Host(`${CD_HOST}`)" + - "traefik.http.routers.cd-${COMPOSE_PROJECT_NAME}-secure.tls=true" cm: isolation: ${ISOLATION} image: ${SITECORE_DOCKER_REGISTRY}sitecore-xm1-cm:${SITECORE_VERSION} @@ -150,7 +146,7 @@ services: - "traefik.enable=true" - "traefik.http.middlewares.force-STS-Header.headers.forceSTSHeader=true" - "traefik.http.middlewares.force-STS-Header.headers.stsSeconds=31536000" - - "traefik.http.routers.cm-secure.entrypoints=websecure" - - "traefik.http.routers.cm-secure.rule=Host(`${CM_HOST}`)" - - "traefik.http.routers.cm-secure.tls=true" - - "traefik.http.routers.cm-secure.middlewares=force-STS-Header" + - "traefik.http.routers.cm-${COMPOSE_PROJECT_NAME}-secure.entrypoints=websecure" + - "traefik.http.routers.cm-${COMPOSE_PROJECT_NAME}-secure.rule=Host(`${CM_HOST}`)" + - "traefik.http.routers.cm-${COMPOSE_PROJECT_NAME}-secure.tls=true" + - "traefik.http.routers.cm-${COMPOSE_PROJECT_NAME}-secure.middlewares=force-STS-Header"