Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions examples/helix-basic-aspnetcore/docker-compose.override.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,16 @@ 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:
- ./docker/traefik:C:/etc/traefik
depends_on:
- rendering
# scale: 0

redis:
image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-redis:${VERSION:-latest}
Expand Down
24 changes: 10 additions & 14 deletions examples/helix-basic-aspnetcore/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,13 @@ 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}
image: ${SITECORE_DOCKER_REGISTRY}nonproduction/solr:8.4.0-${SITECORE_VERSION}
ports:
- "8984:8983"
volumes:
- type: bind
source: .\solr-data
Expand Down Expand Up @@ -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}
Expand All @@ -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}
Expand Down Expand Up @@ -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"
7 changes: 6 additions & 1 deletion examples/helix-basic-aspnetcore/up.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 4 additions & 3 deletions examples/helix-basic-nextjs/docker-compose.override.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,16 +51,17 @@ 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:
volumes:
- ./docker/traefik:C:/etc/traefik
depends_on:
- rendering
# scale: 0

redis:
image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-redis:${VERSION:-latest}
Expand Down
24 changes: 10 additions & 14 deletions examples/helix-basic-nextjs/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,13 @@ 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}
image: ${SITECORE_DOCKER_REGISTRY}nonproduction/solr:8.4.0-${SITECORE_VERSION}
ports:
- "8984:8983"
volumes:
- type: bind
source: .\solr-data
Expand Down Expand Up @@ -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}
Expand All @@ -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}
Expand Down Expand Up @@ -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"
7 changes: 6 additions & 1 deletion examples/helix-basic-nextjs/up.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ services:
traefik:
volumes:
- ./docker/traefik:C:/etc/traefik
# scale: 0

redis:
image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-redis:${VERSION:-latest}
Expand Down Expand Up @@ -80,7 +81,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}
Expand Down
24 changes: 10 additions & 14 deletions examples/helix-basic-tds-consolidated/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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}
Expand All @@ -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}
Expand Down Expand Up @@ -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"
3 changes: 2 additions & 1 deletion examples/helix-basic-tds/docker-compose.override.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ services:
traefik:
volumes:
- ./docker/traefik:C:/etc/traefik
# scale: 0

redis:
image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-redis:${VERSION:-latest}
Expand Down Expand Up @@ -79,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}
Expand Down
24 changes: 10 additions & 14 deletions examples/helix-basic-tds/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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}
Expand All @@ -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}
Expand Down Expand Up @@ -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"
3 changes: 2 additions & 1 deletion examples/helix-basic-unicorn/docker-compose.override.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ services:
traefik:
volumes:
- ./docker/traefik:C:/etc/traefik
# scale: 0

redis:
image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-redis:${VERSION:-latest}
Expand Down Expand Up @@ -76,7 +77,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}
Expand Down
Loading