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
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Repository of Sitecore Docker images
# Repository of Sitecore Docker images

[//]: # "start: stats"

[![License: MIT](https://img.shields.io/badge/License-MIT-green.svg?style=flat-square)](https://opensource.org/licenses/MIT) ![Repositories](https://img.shields.io/badge/Repositories-261-blue.svg?style=flat-square) ![Tags](https://img.shields.io/badge/Tags-2328-blue.svg?style=flat-square) ![Deprecated](https://img.shields.io/badge/Deprecated-0-lightgrey.svg?style=flat-square) ![Dockerfiles](https://img.shields.io/badge/Dockerfiles-129-blue.svg?style=flat-square) ![Default version](https://img.shields.io/badge/Default%20version-10.0.0%20on%20ltsc2019/1809-blue?style=flat-square)
[![License: MIT](https://img.shields.io/badge/License-MIT-green.svg?style=flat-square)](https://opensource.org/licenses/MIT) ![Repositories](https://img.shields.io/badge/Repositories-265-blue.svg?style=flat-square) ![Tags](https://img.shields.io/badge/Tags-2348-blue.svg?style=flat-square) ![Deprecated](https://img.shields.io/badge/Deprecated-0-lightgrey.svg?style=flat-square) ![Dockerfiles](https://img.shields.io/badge/Dockerfiles-130-blue.svg?style=flat-square) ![Default version](https://img.shields.io/badge/Default%20version-10.0.0%20on%20ltsc2019/1809-blue?style=flat-square)

[//]: # "end: stats"

Expand Down
4 changes: 4 additions & 0 deletions build/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## February 2021

- [Added] [Azure Blob Storage module](https://doc.sitecore.com/developers/93/sitecore-experience-manager/en/sitecore-blob-storage.html). 9.3.0 image variants for xm/xp topologies, included xm docker-compose test

## January 2021

- [Changed] Removed -Property FullName from Get-Item "C:\Program Files\Microsoft SQL Server\*\DAC\bin\SqlPackage.exe" | Select-Object -Last 1 -ExpandProperty FullName.
Expand Down
1,468 changes: 744 additions & 724 deletions build/IMAGES.md

Large diffs are not rendered by default.

774 changes: 389 additions & 385 deletions build/sitecore-packages.json

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion build/windows/9.3.0/sitecore-assets/build.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
"Sitecore.PowerShell.Extensions-6.0.scwdp.zip",
"Sitecore Publishing Service 4.2.0-win-x64.zip",
"Sitecore Publishing Module 9.3.0.0 rev. r00546.2197.scwdp.zip",
"Sitecore Horizon 9.3.0 for Azure.zip"
"Sitecore Horizon 9.3.0 for Azure.zip",
"Sitecore.BlobStorageProvider 1.0.0-r50 rev. 000382.scwdp.zip"
]
}
32 changes: 32 additions & 0 deletions build/windows/9.x.x/sitecore-bl/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# escape=`
ARG BASE_IMAGE
ARG ASSETS_IMAGE

FROM $ASSETS_IMAGE as assets
FROM $BASE_IMAGE as build

SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]

ARG ASSETS_USE_WDP

COPY --from=assets ["${ASSETS_USE_WDP}", "C:\\temp\\packages\\"]

# expand selected wdp into installation directory
RUN Expand-Archive -Path 'C:\\temp\\packages\\*.zip' -DestinationPath 'C:\\temp'; `
Copy-Item -Path 'C:\\temp\\Content\\Website\\*' -Destination 'C:\\inetpub\\wwwroot' -Recurse -Force;

# copy tools and transforms
COPY --from=assets ["C:\\install\\tools\\", "C:\\install\\tools\\"]

# run connectionstring transform
RUN & 'C:\\install\\tools\\scripts\\Invoke-XdtTransform.ps1' `
-Path 'C:\\inetpub\\wwwroot\\App_Config\\ConnectionStrings.config' `
-XdtPath 'C:\\inetpub\\wwwroot\\App_Data\\Transforms\\AzureBlobStorageProvider\\Xdts\\App_Config\\ConnectionStrings.config.xdt' `
-XdtDllPath 'C:\\install\\tools\\bin\\Microsoft.Web.XmlTransform.dll';

FROM $BASE_IMAGE

SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]

COPY --from=build ["C:\\inetpub\\wwwroot\\", "C:\\inetpub\\wwwroot\\"]

41 changes: 41 additions & 0 deletions build/windows/9.x.x/sitecore-bl/build.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{
"tags": [
{
"tag": "sitecore-xm-bl-cm:9.3.0-windowsservercore-${windowsservercore_version}",
"build-options": [
"--build-arg BASE_IMAGE=sitecore-xm-cm:9.3.0-windowsservercore-${windowsservercore_version}",
"--build-arg ASSETS_IMAGE=sitecore-assets:9.3.0-nanoserver-${nanoserver_version}",
"--build-arg ASSETS_USE_WDP='C:\\packages\\Sitecore.BlobStorageProvider 1.0.0-r50.scwdp.zip'"
],
"experimental": true
},
{
"tag": "sitecore-xm-bl-cd:9.3.0-windowsservercore-${windowsservercore_version}",
"build-options": [
"--build-arg BASE_IMAGE=sitecore-xm-cd:9.3.0-windowsservercore-${windowsservercore_version}",
"--build-arg ASSETS_IMAGE=sitecore-assets:9.3.0-nanoserver-${nanoserver_version}",
"--build-arg ASSETS_USE_WDP='C:\\packages\\Sitecore.BlobStorageProvider 1.0.0-r50.scwdp.zip'"
],
"experimental": true
},
{
"tag": "sitecore-xp-bl-standalone:9.3.0-windowsservercore-${windowsservercore_version}",
"build-options": [
"--build-arg BASE_IMAGE=sitecore-xp-standalone:9.3.0-windowsservercore-${windowsservercore_version}",
"--build-arg ASSETS_IMAGE=sitecore-assets:9.3.0-nanoserver-${nanoserver_version}",
"--build-arg ASSETS_USE_WDP='C:\\packages\\Sitecore.BlobStorageProvider 1.0.0-r50.scwdp.zip'"
],
"experimental": true
},
{
"tag": "sitecore-xp-bl-cd:9.3.0-windowsservercore-${windowsservercore_version}",
"build-options": [
"--build-arg BASE_IMAGE=sitecore-xp-cd:9.3.0-windowsservercore-${windowsservercore_version}",
"--build-arg ASSETS_IMAGE=sitecore-assets:9.3.0-nanoserver-${nanoserver_version}",
"--build-arg ASSETS_USE_WDP='C:\\packages\\Sitecore.BlobStorageProvider 1.0.0-r50.scwdp.zip'"
],
"experimental": true
}
],
"sources": []
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<connectionStrings xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
<add name="azureblob" connectionString="" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
</connectionStrings>
6 changes: 5 additions & 1 deletion build/windows/tests/9.3.x/.env
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,8 @@ SITECORE_LICENSE=
SQL_SA_PASSWORD=8Tombs-Given-Clock#-arming-Alva-debut-Spine-monica-Normal-Ted-About1-chard-Easily-granddad-5Context!
TELERIK_ENCRYPTION_KEY=qspJhcSmT5VQSfbZadFfzhCK6Ud7uRoS42Qcm8UofvVLiXciUBcUeZELsTo8KD9o6KderQr9Z8uZ9CHisFJNRz46WTZ5qCRufRFt
LICENSE_PATH=C:\license
ISOLATION=process
ISOLATION=process

# CONNECTIONSTRING_AZUREBLOB - Used for blobstorage (-bl) images.
# > Connection string to an Azure Storage account with a storage-container named "blobcontainer" (default).
CONNECTIONSTRING_AZUREBLOB=
77 changes: 77 additions & 0 deletions build/windows/tests/9.3.x/docker-compose.xm.bl.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
version: "2.4"

services:
sql:
image: ${REGISTRY}sitecore-xm-sqldev:${SITECORE_VERSION}-windowsservercore-${WINDOWSSERVERCORE_VERSION}
volumes:
- .\data\sql:C:\Data
mem_limit: 2GB
ports:
- "44010:1433"
environment:
SA_PASSWORD: ${SQL_SA_PASSWORD}
ACCEPT_EULA: "Y"

solr:
image: ${REGISTRY}sitecore-xm-solr:${SITECORE_VERSION}-nanoserver-${NANOSERVER_VERSION}
volumes:
- .\data\solr:C:\Data
mem_limit: 1GB
ports:
- "44011:8983"
environment:
SOLR_LOG_LEVEL: INFO

cd:
image: ${REGISTRY}sitecore-xm-bl-cd:${SITECORE_VERSION}-windowsservercore-${WINDOWSSERVERCORE_VERSION}
entrypoint: powershell.exe -Command "& C:\\tools\\entrypoints\\iis\\Development.ps1"
ports:
- "44002:80"
environment:
SITECORE_LICENSE: ${SITECORE_LICENSE}
SITECORE_APPSETTINGS_ROLE:DEFINE: ContentDelivery
SITECORE_CONNECTIONSTRINGS_SECURITY: Data Source=sql;Initial Catalog=Sitecore.Core;User ID=sa;Password=${SQL_SA_PASSWORD}
SITECORE_CONNECTIONSTRINGS_WEB: Data Source=sql;Initial Catalog=Sitecore.Web;User ID=sa;Password=${SQL_SA_PASSWORD}
SITECORE_CONNECTIONSTRINGS_EXPERIENCEFORMS: Data Source=sql;Initial Catalog=Sitecore.ExperienceForms;User ID=sa;Password=${SQL_SA_PASSWORD}
SITECORE_CONNECTIONSTRINGS_SOLR.SEARCH: http://solr:8983/solr
SITECORE_CONNECTIONSTRINGS_AZUREBLOB: ${CONNECTIONSTRING_AZUREBLOB}
ENTRYPOINT_STDOUT_IIS_ACCESS_LOG_ENABLED: 'true'
ENTRYPOINT_STDOUT_IIS_ERROR_LOG_ENABLED: 'true'
ENTRYPOINT_STDOUT_SITECORE_LOG_ENABLED: 'true'
depends_on:
sql:
condition: service_healthy
solr:
condition: service_started

cm:
image: ${REGISTRY}sitecore-xm-bl:${SITECORE_VERSION}-windowsservercore-${WINDOWSSERVERCORE_VERSION}
entrypoint: powershell.exe -Command "& C:\\tools\\entrypoints\\iis\\Development.ps1"
ports:
- "44001:80"
environment:
SITECORE_LICENSE: ${SITECORE_LICENSE}
SITECORE_APPSETTINGS_ROLE:DEFINE: ContentManagement, Indexing
SITECORE_CONNECTIONSTRINGS_CORE: Data Source=sql;Initial Catalog=Sitecore.Core;User ID=sa;Password=${SQL_SA_PASSWORD}
SITECORE_CONNECTIONSTRINGS_SECURITY: Data Source=sql;Initial Catalog=Sitecore.Core;User ID=sa;Password=${SQL_SA_PASSWORD}
SITECORE_CONNECTIONSTRINGS_MASTER: Data Source=sql;Initial Catalog=Sitecore.Master;User ID=sa;Password=${SQL_SA_PASSWORD}
SITECORE_CONNECTIONSTRINGS_WEB: Data Source=sql;Initial Catalog=Sitecore.Web;User ID=sa;Password=${SQL_SA_PASSWORD}
SITECORE_CONNECTIONSTRINGS_EXPERIENCEFORMS: Data Source=sql;Initial Catalog=Sitecore.ExperienceForms;User ID=sa;Password=${SQL_SA_PASSWORD}
SITECORE_CONNECTIONSTRINGS_SOLR.SEARCH: http://solr:8983/solr
SITECORE_CONNECTIONSTRINGS_AZUREBLOB: ${CONNECTIONSTRING_AZUREBLOB}
SITECORE_APPSETTINGS_TELERIK.ASYNCUPLOAD.CONFIGURATIONENCRYPTIONKEY: ${TELERIK_ENCRYPTION_KEY}
SITECORE_APPSETTINGS_TELERIK.UPLOAD.CONFIGURATIONHASHKEY: ${TELERIK_ENCRYPTION_KEY}
SITECORE_APPSETTINGS_TELERIK.WEB.UI.DIALOGPARAMETERSENCRYPTIONKEY: ${TELERIK_ENCRYPTION_KEY}
ENTRYPOINT_STDOUT_IIS_ACCESS_LOG_ENABLED: 'false'
ENTRYPOINT_STDOUT_IIS_ERROR_LOG_ENABLED: 'false'
ENTRYPOINT_STDOUT_SITECORE_LOG_ENABLED: 'true'
depends_on:
sql:
condition: service_healthy
solr:
condition: service_started

networks:
default:
external:
name: nat