Skip to content

Commit 79ff1b8

Browse files
peternazarov-valtechcompeternazarov-valtechcom
committed
Made "traefik.http.routers" names docker-compose project specific so that they do not cause Traefik container routing configuration clash error when running several docker-compose based local dev instances at the same time.
1 parent c663357 commit 79ff1b8

12 files changed

Lines changed: 71 additions & 61 deletions

File tree

‎examples/helix-basic-aspnetcore/docker-compose.override.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ services:
4646
- cd
4747
labels:
4848
- "traefik.enable=true"
49-
- "traefik.http.routers.rendering-secure.entrypoints=websecure"
50-
- "traefik.http.routers.rendering-secure.rule=Host(`${RENDERING_HOST}`)"
51-
- "traefik.http.routers.rendering-secure.tls=true"
49+
- "traefik.http.routers.rendering-${COMPOSE_PROJECT_NAME}-secure.entrypoints=websecure"
50+
- "traefik.http.routers.rendering-${COMPOSE_PROJECT_NAME}-secure.rule=Host(`${RENDERING_HOST}`)"
51+
- "traefik.http.routers.rendering-${COMPOSE_PROJECT_NAME}-secure.tls=true"
5252

5353
traefik:
5454
volumes:

‎examples/helix-basic-aspnetcore/docker-compose.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@ services:
7979
condition: service_healthy
8080
labels:
8181
- "traefik.enable=true"
82-
- "traefik.http.routers.id-secure.entrypoints=websecure"
83-
- "traefik.http.routers.id-secure.rule=Host(`${ID_HOST}`)"
84-
- "traefik.http.routers.id-secure.tls=true"
82+
- "traefik.http.routers.id-${COMPOSE_PROJECT_NAME}-secure.entrypoints=websecure"
83+
- "traefik.http.routers.id-${COMPOSE_PROJECT_NAME}-secure.rule=Host(`${ID_HOST}`)"
84+
- "traefik.http.routers.id-${COMPOSE_PROJECT_NAME}-secure.tls=true"
8585
cd:
8686
isolation: ${ISOLATION}
8787
image: ${SITECORE_DOCKER_REGISTRY}sitecore-xm1-cd:${SITECORE_VERSION}
@@ -107,9 +107,9 @@ services:
107107
timeout: 300s
108108
labels:
109109
- "traefik.enable=true"
110-
- "traefik.http.routers.cd-secure.entrypoints=websecure"
111-
- "traefik.http.routers.cd-secure.rule=Host(`${CD_HOST}`)"
112-
- "traefik.http.routers.cd-secure.tls=true"
110+
- "traefik.http.routers.cd-${COMPOSE_PROJECT_NAME}-secure.entrypoints=websecure"
111+
- "traefik.http.routers.cd-${COMPOSE_PROJECT_NAME}-secure.rule=Host(`${CD_HOST}`)"
112+
- "traefik.http.routers.cd-${COMPOSE_PROJECT_NAME}-secure.tls=true"
113113
cm:
114114
isolation: ${ISOLATION}
115115
image: ${SITECORE_DOCKER_REGISTRY}sitecore-xm1-cm:${SITECORE_VERSION}
@@ -146,7 +146,7 @@ services:
146146
- "traefik.enable=true"
147147
- "traefik.http.middlewares.force-STS-Header.headers.forceSTSHeader=true"
148148
- "traefik.http.middlewares.force-STS-Header.headers.stsSeconds=31536000"
149-
- "traefik.http.routers.cm-secure.entrypoints=websecure"
150-
- "traefik.http.routers.cm-secure.rule=Host(`${CM_HOST}`)"
151-
- "traefik.http.routers.cm-secure.tls=true"
152-
- "traefik.http.routers.cm-secure.middlewares=force-STS-Header"
149+
- "traefik.http.routers.cm-${COMPOSE_PROJECT_NAME}-secure.entrypoints=websecure"
150+
- "traefik.http.routers.cm-${COMPOSE_PROJECT_NAME}-secure.rule=Host(`${CM_HOST}`)"
151+
- "traefik.http.routers.cm-${COMPOSE_PROJECT_NAME}-secure.tls=true"
152+
- "traefik.http.routers.cm-${COMPOSE_PROJECT_NAME}-secure.middlewares=force-STS-Header"

‎examples/helix-basic-aspnetcore/up.ps1‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,12 @@ $startTime = Get-Date
2424
do {
2525
Start-Sleep -Milliseconds 100
2626
try {
27-
$status = Invoke-RestMethod "http://localhost:8079/api/http/routers/cm-secure@docker"
27+
28+
#WORKAROUND: https://github.com/Sitecore/docker-tools/issues/38
29+
$envFileAbsolutePath = $(Get-Item -Path ".env").FullName
30+
31+
$compose_project_name = Get-EnvFileVariable -Variable "COMPOSE_PROJECT_NAME" -Path $envFileAbsolutePath
32+
$status = Invoke-RestMethod "http://localhost:8079/api/http/routers/cm-$compose_project_name-secure@docker"
2833
} catch {
2934
if ($_.Exception.Response.StatusCode.value__ -ne "404") {
3035
throw

‎examples/helix-basic-nextjs/docker-compose.override.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ services:
5151
- nodejs
5252
labels:
5353
- "traefik.enable=true"
54-
- "traefik.http.routers.rendering-secure.entrypoints=websecure"
55-
- "traefik.http.routers.rendering-secure.rule=Host(`${RENDERING_HOST}`)"
56-
- "traefik.http.routers.rendering-secure.tls=true"
54+
- "traefik.http.routers.rendering-${COMPOSE_PROJECT_NAME}-secure.entrypoints=websecure"
55+
- "traefik.http.routers.rendering-${COMPOSE_PROJECT_NAME}-secure.rule=Host(`${RENDERING_HOST}`)"
56+
- "traefik.http.routers.rendering-${COMPOSE_PROJECT_NAME}-secure.tls=true"
5757

5858
# Mount the Traefik configuration and certs.
5959
traefik:

‎examples/helix-basic-nextjs/docker-compose.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@ services:
7979
condition: service_healthy
8080
labels:
8181
- "traefik.enable=true"
82-
- "traefik.http.routers.id-secure.entrypoints=websecure"
83-
- "traefik.http.routers.id-secure.rule=Host(`${ID_HOST}`)"
84-
- "traefik.http.routers.id-secure.tls=true"
82+
- "traefik.http.routers.id-${COMPOSE_PROJECT_NAME}-secure.entrypoints=websecure"
83+
- "traefik.http.routers.id-${COMPOSE_PROJECT_NAME}-secure.rule=Host(`${ID_HOST}`)"
84+
- "traefik.http.routers.id-${COMPOSE_PROJECT_NAME}-secure.tls=true"
8585
cd:
8686
isolation: ${ISOLATION}
8787
image: ${SITECORE_DOCKER_REGISTRY}sitecore-xm1-cd:${SITECORE_VERSION}
@@ -107,9 +107,9 @@ services:
107107
timeout: 300s
108108
labels:
109109
- "traefik.enable=true"
110-
- "traefik.http.routers.cd-secure.entrypoints=websecure"
111-
- "traefik.http.routers.cd-secure.rule=Host(`${CD_HOST}`)"
112-
- "traefik.http.routers.cd-secure.tls=true"
110+
- "traefik.http.routers.cd-${COMPOSE_PROJECT_NAME}-secure.entrypoints=websecure"
111+
- "traefik.http.routers.cd-${COMPOSE_PROJECT_NAME}-secure.rule=Host(`${CD_HOST}`)"
112+
- "traefik.http.routers.cd-${COMPOSE_PROJECT_NAME}-secure.tls=true"
113113
cm:
114114
isolation: ${ISOLATION}
115115
image: ${SITECORE_DOCKER_REGISTRY}sitecore-xm1-cm:${SITECORE_VERSION}
@@ -146,7 +146,7 @@ services:
146146
- "traefik.enable=true"
147147
- "traefik.http.middlewares.force-STS-Header.headers.forceSTSHeader=true"
148148
- "traefik.http.middlewares.force-STS-Header.headers.stsSeconds=31536000"
149-
- "traefik.http.routers.cm-secure.entrypoints=websecure"
150-
- "traefik.http.routers.cm-secure.rule=Host(`${CM_HOST}`)"
151-
- "traefik.http.routers.cm-secure.tls=true"
152-
- "traefik.http.routers.cm-secure.middlewares=force-STS-Header"
149+
- "traefik.http.routers.cm-${COMPOSE_PROJECT_NAME}-secure.entrypoints=websecure"
150+
- "traefik.http.routers.cm-${COMPOSE_PROJECT_NAME}-secure.rule=Host(`${CM_HOST}`)"
151+
- "traefik.http.routers.cm-${COMPOSE_PROJECT_NAME}-secure.tls=true"
152+
- "traefik.http.routers.cm-${COMPOSE_PROJECT_NAME}-secure.middlewares=force-STS-Header"

‎examples/helix-basic-nextjs/up.ps1‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,12 @@ $startTime = Get-Date
2424
do {
2525
Start-Sleep -Milliseconds 100
2626
try {
27-
$status = Invoke-RestMethod "http://localhost:8079/api/http/routers/cm-secure@docker"
27+
28+
#WORKAROUND: https://github.com/Sitecore/docker-tools/issues/38
29+
$envFileAbsolutePath = $(Get-Item -Path ".env").FullName
30+
31+
$compose_project_name = Get-EnvFileVariable -Variable "COMPOSE_PROJECT_NAME" -Path $envFileAbsolutePath
32+
$status = Invoke-RestMethod "http://localhost:8079/api/http/routers/cm-$compose_project_name-secure@docker"
2833
} catch {
2934
if ($_.Exception.Response.StatusCode.value__ -ne "404") {
3035
throw

‎examples/helix-basic-tds-consolidated/docker-compose.override.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ services:
8080
SITECORE_DEVELOPMENT_PATCHES: DevEnvOn,CustomErrorsOff,DebugOn,DiagnosticsOff,InitMessagesOff
8181
entrypoint: powershell -Command "& C:\tools\entrypoints\iis\Development.ps1"
8282
labels:
83-
- "traefik.http.routers.cd-secure.rule=Host(`${SITE_HOST}`) || Host(`${CD_HOST}`)"
83+
- "traefik.http.routers.cd-${COMPOSE_PROJECT_NAME}-secure.rule=Host(`${SITE_HOST}`) || Host(`${CD_HOST}`)"
8484

8585
cm:
8686
image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-xm1-cm:${VERSION:-latest}

‎examples/helix-basic-tds-consolidated/docker-compose.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@ services:
7979
condition: service_healthy
8080
labels:
8181
- "traefik.enable=true"
82-
- "traefik.http.routers.id-secure.entrypoints=websecure"
83-
- "traefik.http.routers.id-secure.rule=Host(`${ID_HOST}`)"
84-
- "traefik.http.routers.id-secure.tls=true"
82+
- "traefik.http.routers.id-${COMPOSE_PROJECT_NAME}-secure.entrypoints=websecure"
83+
- "traefik.http.routers.id-${COMPOSE_PROJECT_NAME}-secure.rule=Host(`${ID_HOST}`)"
84+
- "traefik.http.routers.id-${COMPOSE_PROJECT_NAME}-secure.tls=true"
8585
cd:
8686
isolation: ${ISOLATION}
8787
image: ${SITECORE_DOCKER_REGISTRY}sitecore-xm1-cd:${SITECORE_VERSION}
@@ -107,9 +107,9 @@ services:
107107
timeout: 300s
108108
labels:
109109
- "traefik.enable=true"
110-
- "traefik.http.routers.cd-secure.entrypoints=websecure"
111-
- "traefik.http.routers.cd-secure.rule=Host(`${CD_HOST}`)"
112-
- "traefik.http.routers.cd-secure.tls=true"
110+
- "traefik.http.routers.cd-${COMPOSE_PROJECT_NAME}-secure.entrypoints=websecure"
111+
- "traefik.http.routers.cd-${COMPOSE_PROJECT_NAME}-secure.rule=Host(`${CD_HOST}`)"
112+
- "traefik.http.routers.cd-${COMPOSE_PROJECT_NAME}-secure.tls=true"
113113
cm:
114114
isolation: ${ISOLATION}
115115
image: ${SITECORE_DOCKER_REGISTRY}sitecore-xm1-cm:${SITECORE_VERSION}
@@ -146,7 +146,7 @@ services:
146146
- "traefik.enable=true"
147147
- "traefik.http.middlewares.force-STS-Header.headers.forceSTSHeader=true"
148148
- "traefik.http.middlewares.force-STS-Header.headers.stsSeconds=31536000"
149-
- "traefik.http.routers.cm-secure.entrypoints=websecure"
150-
- "traefik.http.routers.cm-secure.rule=Host(`${CM_HOST}`)"
151-
- "traefik.http.routers.cm-secure.tls=true"
152-
- "traefik.http.routers.cm-secure.middlewares=force-STS-Header"
149+
- "traefik.http.routers.cm-${COMPOSE_PROJECT_NAME}-secure.entrypoints=websecure"
150+
- "traefik.http.routers.cm-${COMPOSE_PROJECT_NAME}-secure.rule=Host(`${CM_HOST}`)"
151+
- "traefik.http.routers.cm-${COMPOSE_PROJECT_NAME}-secure.tls=true"
152+
- "traefik.http.routers.cm-${COMPOSE_PROJECT_NAME}-secure.middlewares=force-STS-Header"

‎examples/helix-basic-tds/docker-compose.override.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ services:
7979
SITECORE_DEVELOPMENT_PATCHES: DevEnvOn,CustomErrorsOff,DebugOn,DiagnosticsOff,InitMessagesOff
8080
entrypoint: powershell -Command "& C:\tools\entrypoints\iis\Development.ps1"
8181
labels:
82-
- "traefik.http.routers.cd-secure.rule=Host(`${SITE_HOST}`) || Host(`${CD_HOST}`)"
82+
- "traefik.http.routers.cd-${COMPOSE_PROJECT_NAME}-secure.rule=Host(`${SITE_HOST}`) || Host(`${CD_HOST}`)"
8383

8484
cm:
8585
image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-xm1-cm:${VERSION:-latest}

‎examples/helix-basic-tds/docker-compose.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@ services:
7979
condition: service_healthy
8080
labels:
8181
- "traefik.enable=true"
82-
- "traefik.http.routers.id-secure.entrypoints=websecure"
83-
- "traefik.http.routers.id-secure.rule=Host(`${ID_HOST}`)"
84-
- "traefik.http.routers.id-secure.tls=true"
82+
- "traefik.http.routers.id-${COMPOSE_PROJECT_NAME}-secure.entrypoints=websecure"
83+
- "traefik.http.routers.id-${COMPOSE_PROJECT_NAME}-secure.rule=Host(`${ID_HOST}`)"
84+
- "traefik.http.routers.id-${COMPOSE_PROJECT_NAME}-secure.tls=true"
8585
cd:
8686
isolation: ${ISOLATION}
8787
image: ${SITECORE_DOCKER_REGISTRY}sitecore-xm1-cd:${SITECORE_VERSION}
@@ -107,9 +107,9 @@ services:
107107
timeout: 300s
108108
labels:
109109
- "traefik.enable=true"
110-
- "traefik.http.routers.cd-secure.entrypoints=websecure"
111-
- "traefik.http.routers.cd-secure.rule=Host(`${CD_HOST}`)"
112-
- "traefik.http.routers.cd-secure.tls=true"
110+
- "traefik.http.routers.cd-${COMPOSE_PROJECT_NAME}-secure.entrypoints=websecure"
111+
- "traefik.http.routers.cd-${COMPOSE_PROJECT_NAME}-secure.rule=Host(`${CD_HOST}`)"
112+
- "traefik.http.routers.cd-${COMPOSE_PROJECT_NAME}-secure.tls=true"
113113
cm:
114114
isolation: ${ISOLATION}
115115
image: ${SITECORE_DOCKER_REGISTRY}sitecore-xm1-cm:${SITECORE_VERSION}
@@ -146,7 +146,7 @@ services:
146146
- "traefik.enable=true"
147147
- "traefik.http.middlewares.force-STS-Header.headers.forceSTSHeader=true"
148148
- "traefik.http.middlewares.force-STS-Header.headers.stsSeconds=31536000"
149-
- "traefik.http.routers.cm-secure.entrypoints=websecure"
150-
- "traefik.http.routers.cm-secure.rule=Host(`${CM_HOST}`)"
151-
- "traefik.http.routers.cm-secure.tls=true"
152-
- "traefik.http.routers.cm-secure.middlewares=force-STS-Header"
149+
- "traefik.http.routers.cm-${COMPOSE_PROJECT_NAME}-secure.entrypoints=websecure"
150+
- "traefik.http.routers.cm-${COMPOSE_PROJECT_NAME}-secure.rule=Host(`${CM_HOST}`)"
151+
- "traefik.http.routers.cm-${COMPOSE_PROJECT_NAME}-secure.tls=true"
152+
- "traefik.http.routers.cm-${COMPOSE_PROJECT_NAME}-secure.middlewares=force-STS-Header"

0 commit comments

Comments
 (0)