From cfd7be498caa88a4d19d9b63fb8eaeaee6a04315 Mon Sep 17 00:00:00 2001 From: Per Manniche Bering Date: Wed, 13 Nov 2019 10:59:27 +0100 Subject: [PATCH 1/3] force git to handle md files as text --- .gitattributes | 23 +---- README.md | 268 ++++++++++++++++++++++++------------------------- 2 files changed, 138 insertions(+), 153 deletions(-) diff --git a/.gitattributes b/.gitattributes index c5e4f1a26..886d1e351 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,21 +1,6 @@ -# Auto detect text files and perform LF normalization +# Auto detect text files * text=auto +# Perform LF normalization on shell scripts (required when used as ENTRYPOINT in Docker) *.sh text eol=lf - -# Ensure shell scripts is always LF -*.sh text eol=lf - -# Custom for Visual Studio -*.cs diff=csharp - -# Standard to msysgit -*.doc diff=astextplain -*.DOC diff=astextplain -*.docx diff=astextplain -*.DOCX diff=astextplain -*.dot diff=astextplain -*.DOT diff=astextplain -*.pdf diff=astextplain -*.PDF diff=astextplain -*.rtf diff=astextplain -*.RTF diff=astextplain +# Force markdown files to be text +*.md text \ No newline at end of file diff --git a/README.md b/README.md index 57fa24412..11dc9e28a 100644 --- a/README.md +++ b/README.md @@ -1,134 +1,134 @@ -# 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-58-blue.svg?style=flat-square) ![Tags](https://img.shields.io/badge/Tags-136-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-52-blue.svg?style=flat-square) ![Default version](https://img.shields.io/badge/Default%20version-9.2.0%20on%20ltsc2019/1809-blue?style=flat-square) - -[//]: # "end: stats" - -Build your own Docker images for the most recent versions of Sitecore. See [IMAGES.md](IMAGES.md) for all images currently available. You can also use this repository (preferably from a fork) from you own build server and have it build and push images to your own private Docker registry. - -Jump to the [How to use](#how-to-use) section to get started. - -## IMPORTANT NOTES ABOUT THIS REPOSITORY - -- This repository was created to help consolidate efforts around Sitecore and Docker. -- **The code and examples found in this repository are created and maintained by the Community, unsupported by Sitecore.** -- Official statement from Sitecore on *running* in containers, see [https://kb.sitecore.net/articles/161310](https://kb.sitecore.net/articles/161310). - -### Change Log - -Please see [CHANGELOG.md](CHANGELOG.md). - -### List of all images - -Please see [IMAGES.md](IMAGES.md). - -### Tagging and Windows versions - -This repository can build multiple Windows versions. Read more about [Windows Container Version Compatibility](https://docs.microsoft.com/en-us/virtualization/windowscontainers/deploy-containers/version-compatibility). - -Here is the convention used for Sitecore image tags: - -```text - [REGISTRY/]sitecore-[-VARIANT]-:- -``` - -Example: - -```text - registry.example.com/sitecore-xm-cm:9.2.0-windowsservercore-1903 - \__________________/ \____________/ \___/ \____________________/ - | | | | - registry/org/user repository sc version os version -``` - -## How to use - -### Quick start - -```PowerShell -.\Build.ps1 -SitecoreUsername "YOUR dev.sitecore.net USERNAME" -SitecorePassword "YOUR dev.sitecore.net PASSWORD" -``` - -This will: - -1. Download any missing packages into `.\packages`, if you have another location with files already present you can call `Build.ps1` with the parameter `-InstallSourcePath`. -1. Build all images of latest Sitecore version on latest LTSC (Long Term Support Channel) Windows version. - -> Images will always be saved locally but not pushed to any remote registries by default. See [Setting up automated builds](#setting-up-automated-builds) for details on how to do this. - -When completed: - -1. Place your Sitecore license file at `C:\license\license.xml`, or override location using the environment variable `LICENSE_PATH` like so: `$env:LICENSE_PATH="D:\my\sitecore\licenses"` -1. Switch directory to .\windows\tests\9.x.x\ Then run any of the docker-compose files, for example an XM with: `docker-compose --file .\docker-compose.xm.yml up` - -### Setting up automated builds - -### Prerequisites - -- A **private** Docker repository. Any will do, but the easiest is to use a [Azure Container Registry](https://azure.microsoft.com/en-us/services/container-registry/). -- A file location that your build agents can reach to store downloads from [https://dev.sitecore.net/](https://dev.sitecore.net/). - -#### Windows - -1. Latest Windows 10 or Windows Server 2019 with Hyper-V and Containers features installed. -1. Latest stable Docker engine and cli. - -#### Linux (optional) - -1. [PowerShell Core](https://github.com/powershell/powershell) so you can use the PowerShell module. -1. Latest stable Docker engine and cli. - -### Configure your build server - -1. Trigger a build on changes to `master` - to get new versions. -1. Trigger once a week - to get base images updated when Microsoft releases patched images. - -Example: - -```PowerShell - -# required, change if you need to build images in other folders such as ".\linux" or ".\legacy" -$imagesPath = (Join-Path $PSScriptRoot "\windows") - -# optional, default value is ".\packages". Can be on local machine or a file share. -$installSourcePath = (Join-Path $PSScriptRoot "\packages") - -# optional, on Docker Hub it's your username or organization, else it's the hostname of your -# own registry. This parameter is optional but you will not be able to push images to a -# remote registry without. -# -# PLEASE NOTE: DO NOT SPECIFY A PUBLIC REGISTRY! -# -$registry = "YOUR REGISTRY NAME" ` - -# optional, default value is the latest Sitecore version on latest LTSC version -# of Windows. Set to for example "*" for build everything or "*:9.1.1*1903", "*:9.2.0*1903" to -# only build 9.1.1 and 9.2.0 on Windows 1903. -$tags = "*" - -# required -$sitecoreUsername = "YOUR dev.sitecore.net USERNAME" - -# required -$sitecorePassword = "YOUR dev.sitecore.net PASSWORD" - -# import builder module -Import-Module (Join-Path $PSScriptRoot "\modules\SitecoreImageBuilder") -Force - -# restore packages needed for the build, only files missing in $installSourcePath will be downloaded -SitecoreImageBuilder\Invoke-PackageRestore ` - -Path $imagesPath ` - -Destination $installSourcePath ` - -Tags $tags ` - -SitecoreUsername $sitecoreUsername ` - -SitecorePassword $sitecorePassword - -# build and push images -SitecoreImageBuilder\Invoke-Build ` - -Path $imagesPath ` - -InstallSourcePath $installSourcePath ` - -Registry $registry ` - -Tags $tags -``` +# 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-58-blue.svg?style=flat-square) ![Tags](https://img.shields.io/badge/Tags-136-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-52-blue.svg?style=flat-square) ![Default version](https://img.shields.io/badge/Default%20version-9.2.0%20on%20ltsc2019/1809-blue?style=flat-square) + +[//]: # "end: stats" + +Build your own Docker images for the most recent versions of Sitecore. See [IMAGES.md](IMAGES.md) for all images currently available. You can also use this repository (preferably from a fork) from you own build server and have it build and push images to your own private Docker registry. + +Jump to the [How to use](#how-to-use) section to get started. + +## IMPORTANT NOTES ABOUT THIS REPOSITORY + +- This repository was created to help consolidate efforts around Sitecore and Docker. +- **The code and examples found in this repository are created and maintained by the Community, unsupported by Sitecore.** +- Official statement from Sitecore on *running* in containers, see [https://kb.sitecore.net/articles/161310](https://kb.sitecore.net/articles/161310). + +### Change Log + +Please see [CHANGELOG.md](CHANGELOG.md). + +### List of all images + +Please see [IMAGES.md](IMAGES.md). + +### Tagging and Windows versions + +This repository can build multiple Windows versions. Read more about [Windows Container Version Compatibility](https://docs.microsoft.com/en-us/virtualization/windowscontainers/deploy-containers/version-compatibility). + +Here is the convention used for Sitecore image tags: + +```text + [REGISTRY/]sitecore-[-VARIANT]-:- +``` + +Example: + +```text + registry.example.com/sitecore-xm-cm:9.2.0-windowsservercore-1903 + \__________________/ \____________/ \___/ \____________________/ + | | | | + registry/org/user repository sc version os version +``` + +## How to use + +### Quick start + +```PowerShell +.\Build.ps1 -SitecoreUsername "YOUR dev.sitecore.net USERNAME" -SitecorePassword "YOUR dev.sitecore.net PASSWORD" +``` + +This will: + +1. Download any missing packages into `.\packages`, if you have another location with files already present you can call `Build.ps1` with the parameter `-InstallSourcePath`. +1. Build all images of latest Sitecore version on latest LTSC (Long Term Support Channel) Windows version. + +> Images will always be saved locally but not pushed to any remote registries by default. See [Setting up automated builds](#setting-up-automated-builds) for details on how to do this. + +When completed: + +1. Place your Sitecore license file at `C:\license\license.xml`, or override location using the environment variable `LICENSE_PATH` like so: `$env:LICENSE_PATH="D:\my\sitecore\licenses"` +1. Switch directory to .\windows\tests\9.x.x\ Then run any of the docker-compose files, for example an XM with: `docker-compose --file .\docker-compose.xm.yml up` + +### Setting up automated builds + +### Prerequisites + +- A **private** Docker repository. Any will do, but the easiest is to use a [Azure Container Registry](https://azure.microsoft.com/en-us/services/container-registry/). +- A file location that your build agents can reach to store downloads from [https://dev.sitecore.net/](https://dev.sitecore.net/). + +#### Windows + +1. Latest Windows 10 or Windows Server 2019 with Hyper-V and Containers features installed. +1. Latest stable Docker engine and cli. + +#### Linux (optional) + +1. [PowerShell Core](https://github.com/powershell/powershell) so you can use the PowerShell module. +1. Latest stable Docker engine and cli. + +### Configure your build server + +1. Trigger a build on changes to `master` - to get new versions. +1. Trigger once a week - to get base images updated when Microsoft releases patched images. + +Example: + +```PowerShell + +# required, change if you need to build images in other folders such as ".\linux" or ".\legacy" +$imagesPath = (Join-Path $PSScriptRoot "\windows") + +# optional, default value is ".\packages". Can be on local machine or a file share. +$installSourcePath = (Join-Path $PSScriptRoot "\packages") + +# optional, on Docker Hub it's your username or organization, else it's the hostname of your +# own registry. This parameter is optional but you will not be able to push images to a +# remote registry without. +# +# PLEASE NOTE: DO NOT SPECIFY A PUBLIC REGISTRY! +# +$registry = "YOUR REGISTRY NAME" ` + +# optional, default value is the latest Sitecore version on latest LTSC version +# of Windows. Set to for example "*" for build everything or "*:9.1.1*1903", "*:9.2.0*1903" to +# only build 9.1.1 and 9.2.0 on Windows 1903. +$tags = "*" + +# required +$sitecoreUsername = "YOUR dev.sitecore.net USERNAME" + +# required +$sitecorePassword = "YOUR dev.sitecore.net PASSWORD" + +# import builder module +Import-Module (Join-Path $PSScriptRoot "\modules\SitecoreImageBuilder") -Force + +# restore packages needed for the build, only files missing in $installSourcePath will be downloaded +SitecoreImageBuilder\Invoke-PackageRestore ` + -Path $imagesPath ` + -Destination $installSourcePath ` + -Tags $tags ` + -SitecoreUsername $sitecoreUsername ` + -SitecorePassword $sitecorePassword + +# build and push images +SitecoreImageBuilder\Invoke-Build ` + -Path $imagesPath ` + -InstallSourcePath $installSourcePath ` + -Registry $registry ` + -Tags $tags +``` From 3055d69fe323d4e130a0e33e3759b7990e58cb16 Mon Sep 17 00:00:00 2001 From: Peter N Date: Thu, 14 Nov 2019 09:57:19 +0100 Subject: [PATCH 2/3] =?UTF-8?q?JSS=20docker=20images=20are=20missing=20the?= =?UTF-8?q?=20web.config=20changes=20which=20should=20be=20=E2=80=A6=20(#1?= =?UTF-8?q?23)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * JSS docker images are missing the web.config changes which should be applied by the XDT files from the SCCPL of Azure's WDP #122 - Extract .xdt files from `\Sitecore JavaScript Services Server for Sitecore 9.2 XM 12.0.0 rev. 190522.scwdp.zip\Content\Website\App_Data\Transforms\JSSSCCPL.sccpl` to `\Website\App_Data\JssXdt\` so that the .xdt files can be picked-up by the transformation script. * JSS docker images are missing the web.config changes which should be applied by the XDT files from the SCCPL of Azure's WDP #122 - FIX for XP: Extract .xdt files from `\Sitecore Experience Accelerator 1.9.0 rev. 190528 for 9.2.scwdp.zip\Content\Website\App_Data\Transforms\JSSSCCPL.sccpl` to `\Website\App_Data\JssXdt\` so that the .xdt files can be picked-up by the transformation script. --- windows/9.2.x/sitecore-xm-jss/Dockerfile | 4 +++- windows/9.2.x/sitecore-xp-jss/Dockerfile | 11 ++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/windows/9.2.x/sitecore-xm-jss/Dockerfile b/windows/9.2.x/sitecore-xm-jss/Dockerfile index 8f77f4573..1c0cf5040 100644 --- a/windows/9.2.x/sitecore-xm-jss/Dockerfile +++ b/windows/9.2.x/sitecore-xm-jss/Dockerfile @@ -11,8 +11,10 @@ ARG ASSETS_USE_WDP COPY --from=assets ["${ASSETS_USE_WDP}", "C:\\temp\\packages\\"] -# expand selected wdp into installation directory +# expand selected wdp, inlcuding .xdt transformation files from the SCCPL package (`Expand-Archive` command needs it to be renamed to .zip file), into installation directory RUN Expand-Archive -Path 'C:\\temp\\packages\\*.zip' -DestinationPath 'C:\\temp'; ` + Rename-Item -Path 'C:\\temp\\Content\\Website\\App_Data\\Transforms\\JSSSCCPL.sccpl' -NewName 'JSSSCCPL.sccpl.zip';` + Expand-Archive -Path 'C:\\temp\\Content\\Website\\App_Data\\Transforms\\JSSSCCPL.sccpl.zip' -DestinationPath 'C:\\temp\\Content\\Website\\App_Data\\JssXdt';` Copy-Item -Path 'C:\\temp\\Content\\Website\\*' -Destination 'C:\\inetpub\\wwwroot' -Recurse -Force; # copy tools and transforms diff --git a/windows/9.2.x/sitecore-xp-jss/Dockerfile b/windows/9.2.x/sitecore-xp-jss/Dockerfile index a9fcb1599..e8c490c8c 100644 --- a/windows/9.2.x/sitecore-xp-jss/Dockerfile +++ b/windows/9.2.x/sitecore-xp-jss/Dockerfile @@ -11,10 +11,19 @@ ARG ASSETS_USE_WDP COPY --from=assets ["${ASSETS_USE_WDP}", "C:\\temp\\packages\\"] -# expand selected wdp into installation directory +# expand selected wdp, inlcuding .xdt transformation files from the SCCPL package (`Expand-Archive` command needs it to be renamed to .zip file), into installation directory RUN Expand-Archive -Path 'C:\\temp\\packages\\*.zip' -DestinationPath 'C:\\temp'; ` + Rename-Item -Path 'C:\\temp\\Content\\Website\\App_Data\\Transforms\\JSSSCCPL.sccpl' -NewName 'JSSSCCPL.sccpl.zip';` + Expand-Archive -Path 'C:\\temp\\Content\\Website\\App_Data\\Transforms\\JSSSCCPL.sccpl.zip' -DestinationPath 'C:\\temp\\Content\\Website\\App_Data\\JssXdt';` 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\\"] + +# find transform files and do transformation +RUN (Get-ChildItem -Path 'C:\\inetpub\\wwwroot\\*.xdt' -Recurse ) | ForEach-Object { & 'C:\\install\\tools\\scripts\\Invoke-XdtTransform.ps1' -Path 'C:\\inetpub\\wwwroot\\web.config' -XdtPath $_.FullName -XdtDllPath 'C:\\install\\tools\\bin\\Microsoft.Web.XmlTransform.dll'; }; + + FROM $BASE_IMAGE SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] From 8aecac80c3dbe58accc923726b5a1036e1e68975 Mon Sep 17 00:00:00 2001 From: Per Manniche Bering Date: Thu, 14 Nov 2019 10:05:21 +0100 Subject: [PATCH 3/3] added support for 1909 (#124) --- CHANGELOG.md | 4 ++++ IMAGES.md | Bin 47296 -> 33963 bytes README.md | 4 ++-- .../SitecoreImageBuilder.psm1 | 3 ++- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4eb352d22..4cc519eef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## November 2019 + +- [Added] Windows 1909 is now also supported. You can override which platforms you want by setting the parameter `AutoGenerateWindowsVersionTags` when calling `Invoke-Build`, default value is: `"1909", "1903", "ltsc2019"`. + ## October 2019 - [Added] Sitecore 9.2.0 XC images. diff --git a/IMAGES.md b/IMAGES.md index 32c16c95bad4e75273bc6113218a2f2c61224aa9..07eee2efce5c936af04caec91b1966b1c8d59659 100644 GIT binary patch literal 33963 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 MMqsIv8T!@c53N&|uK)l5 literal 47296 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 P$uQds=YMwWPx;t?C51e( diff --git a/README.md b/README.md index 11dc9e28a..7e5df654a 100644 --- a/README.md +++ b/README.md @@ -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-58-blue.svg?style=flat-square) ![Tags](https://img.shields.io/badge/Tags-136-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-52-blue.svg?style=flat-square) ![Default version](https://img.shields.io/badge/Default%20version-9.2.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-58-blue.svg?style=flat-square) ![Tags](https://img.shields.io/badge/Tags-198-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-52-blue.svg?style=flat-square) ![Default version](https://img.shields.io/badge/Default%20version-9.2.0%20on%20ltsc2019/1809-blue?style=flat-square) [//]: # "end: stats" diff --git a/modules/SitecoreImageBuilder/SitecoreImageBuilder.psm1 b/modules/SitecoreImageBuilder/SitecoreImageBuilder.psm1 index 1553a3618..f3988c070 100644 --- a/modules/SitecoreImageBuilder/SitecoreImageBuilder.psm1 +++ b/modules/SitecoreImageBuilder/SitecoreImageBuilder.psm1 @@ -683,12 +683,13 @@ function Get-CurrentImagesMarkdown function Get-SupportedWindowsVersions { # NOTE: Order is important, newest first - Write-Output ("1903", "ltsc2019") + Write-Output ("1909", "1903", "ltsc2019") } function Get-WindowsServerCoreToNanoServerVersionMap { Write-Output @{ + "1909" = "1909"; "1903" = "1903"; "ltsc2019" = "1809"; "1803" = "1803";