From 1616583ba793894198772f05778f71c9ac362a3b Mon Sep 17 00:00:00 2001 From: Mikkel Hansen Date: Sat, 2 Nov 2019 12:22:27 +0100 Subject: [PATCH 1/3] Update README.md (#115) Corrected documentation so user is changing directory to where the compose files are located before running docker-compose up. --- README.md | Bin 11518 -> 5785 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/README.md b/README.md index 97d61d18869be9c818350606f97cfa87e6ea2c93..57fa24412cf4fdf552b4989f86fd4c44f20b5eaf 100644 GIT binary patch literal 5785 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 Date: Mon, 4 Nov 2019 14:20:39 +0100 Subject: [PATCH 2/3] fixed build order after XC was added --- modules/SitecoreImageBuilder/SitecoreImageBuilder.psm1 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/SitecoreImageBuilder/SitecoreImageBuilder.psm1 b/modules/SitecoreImageBuilder/SitecoreImageBuilder.psm1 index 40b1c1f3a..1553a3618 100644 --- a/modules/SitecoreImageBuilder/SitecoreImageBuilder.psm1 +++ b/modules/SitecoreImageBuilder/SitecoreImageBuilder.psm1 @@ -107,7 +107,7 @@ function Invoke-PackageRestore { throw ("Unable to login to '{0}' with the supplied credentials." -f $sitecoreDownloadUrl) } - + Write-Verbose ("Logged in to '{0}'." -f $sitecoreDownloadUrl) } @@ -414,16 +414,16 @@ function Initialize-BuildSpecifications "^sitecore-(xm1|xp)-sxa-(.*)-(standalone|cm|cd):(.*)$" # legacy\variants "^sitecore-(xm|xp)-(sql|sqldev):(.*)$", # windows/linux platform - "^sitecore-(xm|xp)-(standalone|cm|cd):(.*)$" # windows platform - - "^sitecore-xp-(.*):(.*)$", # build XP before XC - "^sitecore-xc-(.*):(.*)$", + "^sitecore-(xm|xp)-(standalone|cm|cd|identity):(.*)$" # windows platform + "^sitecore-xp-xconnect(.*):(.*)$" # windows platform "^sitecore-(xm|xp)-(spe|pse)-(sql|sqldev):(.*)$" # SPE windows/linux variants "^sitecore-(xm|xp)-(spe|pse)-(standalone|cm|cd):(.*)$" # SPE windows variants "^sitecore-(xm|xp)-sxa-(sql|sqldev):(.*)$" # SXA windows/linux variants "^sitecore-(xm|xp)-sxa-(standalone|cm|cd):(.*)$" # SXA windows variants + + "^sitecore-xc-(.*):(.*)$" # XC windows variants ) $patterns | ForEach-Object { From 544524f53cdcd6aa936e48aa9532a6c60535fce7 Mon Sep 17 00:00:00 2001 From: Anders Laub Date: Tue, 5 Nov 2019 07:34:09 -0500 Subject: [PATCH 3/3] Added -Recurse to copy tools folder content to identity containers. --- windows/9.2.x/sitecore-xp-identity/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/9.2.x/sitecore-xp-identity/Dockerfile b/windows/9.2.x/sitecore-xp-identity/Dockerfile index b4da56c4f..96e3fd155 100644 --- a/windows/9.2.x/sitecore-xp-identity/Dockerfile +++ b/windows/9.2.x/sitecore-xp-identity/Dockerfile @@ -51,7 +51,7 @@ RUN $env:INSTALL_TEMP = 'C:\\inetpub\\wwwroot\\temp\\install'; ` Start-Process (Join-Path $env:INSTALL_TEMP '\\setup\\vc_redist.exe') -ArgumentList '/install', '/passive', '/norestart' -NoNewWindow -Wait; ` Start-Process (Join-Path $env:INSTALL_TEMP '\\setup\\dotnet-hosting.exe') -ArgumentList '/install', '/quiet' -NoNewWindow -Wait; ` # install tools - Copy-Item -Path (Join-Path $env:INSTALL_TEMP '\\tools') -Destination 'C:\\tools' -Force; ` + Copy-Item -Path (Join-Path $env:INSTALL_TEMP '\\tools') -Force -Recurse -Destination 'C:\\tools' ; ` setx /M PATH $($env:PATH + ';C:\tools\scripts;C:\tools\bin;C:\Program Files\dotnet') | Out-Null; ` # install certificates $password = ConvertTo-SecureString -String (Get-Content -Path (Join-Path $env:INSTALL_TEMP '\\certificates\\password')) -Force -AsPlainText; `