Skip to content

Sitecore Docker Examples Release #2 (Sitecore 10.0) #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nickwesselman merged 6 commits into from
Aug 19, 2020
Merged

Sitecore Docker Examples Release #2 (Sitecore 10.0) #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e733564
[#18] Remove (now unnecessary) -AllowPrerelease parameter on Sitecore…
Aug 18, 2020
8ba8b30
[#16] Use generic cert file names to remove dependency on hostname
Aug 10, 2020
50e1c62
[#17] Configure cd service for HTTPS access
Aug 10, 2020
2d3f3dd
Merge pull request #20 from Sitecore/issue/17/cd-https-configuration
nickwesselman Aug 18, 2020
ae82702
Merge pull request #21 from Sitecore/issue/18/remove-allowprerelease
nickwesselman Aug 18, 2020
ad71c10
Merge pull request #19 from Sitecore/issue/16/certs-config-hostname
nickwesselman Aug 18, 2020
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
3 changes: 3 additions & 0 deletions custom-images/docker-compose.xm1.override.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,9 @@ services:
- ${LOCAL_DEPLOY_PATH}\website:C:\deploy
- ${LOCAL_DATA_PATH}\cd:C:\inetpub\wwwroot\App_Data\logs
entrypoint: powershell -Command "& C:\tools\entrypoints\iis\Development.ps1"
labels:
- "traefik.http.routers.cd.entrypoints=websecure"
- "traefik.http.routers.cd.tls=true"

cm:
image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-xm1-cm:${VERSION:-latest}
Expand Down
3 changes: 3 additions & 0 deletions custom-images/docker-compose.xp1.override.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,9 @@ services:
- ${LOCAL_DEPLOY_PATH}\website:C:\deploy
- ${LOCAL_DATA_PATH}\cd:C:\inetpub\wwwroot\App_Data\logs
entrypoint: powershell -Command "& C:\tools\entrypoints\iis\Development.ps1"
labels:
- "traefik.http.routers.cd.entrypoints=websecure"
- "traefik.http.routers.cd.tls=true"

cm:
image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-xp1-cm:${VERSION:-latest}
Expand Down
4 changes: 2 additions & 2 deletions custom-images/docker/traefik/config/dynamic/certs_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tls:
certificates:
- certFile: C:\etc\traefik\certs\_wildcard.dockerexamples.localhost.pem
keyFile: C:\etc\traefik\certs\_wildcard.dockerexamples.localhost-key.pem
- certFile: C:\etc\traefik\certs\cert.pem
keyFile: C:\etc\traefik\certs\key.pem
6 changes: 3 additions & 3 deletions custom-images/init.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ if (-not $SitecoreGallery) {
# Install and Import SitecoreDockerTools
$dockerToolsVersion = "10.0.5"
Remove-Module SitecoreDockerTools -ErrorAction SilentlyContinue
if (-not (Get-InstalledModule -Name SitecoreDockerTools -RequiredVersion $dockerToolsVersion -AllowPrerelease -ErrorAction SilentlyContinue)) {
if (-not (Get-InstalledModule -Name SitecoreDockerTools -RequiredVersion $dockerToolsVersion -ErrorAction SilentlyContinue)) {
Write-Host "Installing SitecoreDockerTools..." -ForegroundColor Green
Install-Module SitecoreDockerTools -RequiredVersion $dockerToolsVersion -AllowPrerelease -Scope CurrentUser -Repository $SitecoreGallery.Name
Install-Module SitecoreDockerTools -RequiredVersion $dockerToolsVersion -Scope CurrentUser -Repository $SitecoreGallery.Name
}
Write-Host "Importing SitecoreDockerTools..." -ForegroundColor Green
Import-Module SitecoreDockerTools -RequiredVersion $dockerToolsVersion
Expand Down Expand Up @@ -106,7 +106,7 @@ try {
}
Write-Host "Generating Traefik TLS certificate..." -ForegroundColor Green
& $mkcert -install
& $mkcert "*.$($HostName).localhost"
& $mkcert -key-file key.pem -cert-file cert.pem "*.$($HostName).localhost"
}
catch {
Write-Host "An error occurred while attempting to generate TLS certificate: $_" -ForegroundColor Red
Expand Down
4 changes: 2 additions & 2 deletions getting-started/init.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ if (-not $SitecoreGallery) {
# Install and Import SitecoreDockerTools
$dockerToolsVersion = "10.0.5"
Remove-Module SitecoreDockerTools -ErrorAction SilentlyContinue
if (-not (Get-InstalledModule -Name SitecoreDockerTools -RequiredVersion $dockerToolsVersion -AllowPrerelease -ErrorAction SilentlyContinue)) {
if (-not (Get-InstalledModule -Name SitecoreDockerTools -RequiredVersion $dockerToolsVersion -ErrorAction SilentlyContinue)) {
Write-Host "Installing SitecoreDockerTools..." -ForegroundColor Green
Install-Module SitecoreDockerTools -RequiredVersion $dockerToolsVersion -AllowPrerelease -Scope CurrentUser -Repository $SitecoreGallery.Name
Install-Module SitecoreDockerTools -RequiredVersion $dockerToolsVersion -Scope CurrentUser -Repository $SitecoreGallery.Name
}
Write-Host "Importing SitecoreDockerTools..." -ForegroundColor Green
Import-Module SitecoreDockerTools -RequiredVersion $dockerToolsVersion
Expand Down