Fixed issue where the disabled configs are not packaged.

SitecorePowerShell · May 8, 2020 · 7453ba8 · 7453ba8
1 parent e560543
commit 7453ba8
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 8 deletions.
diff --git a/docker-compose.override.yml.example b/docker-compose.override.yml.example
@@ -9,7 +9,7 @@ services:
         target: '\\.\pipe\docker_engine'
         type: npipe
   cm:
-    entrypoint: powershell.exe -Command "& C:\\startup\\startup.ps1"
+    entrypoint: powershell.exe -Command "& C:\\startup\\startup.ps1 -EntrypointScriptPath C:\\tools\\entrypoints\\iis\\Development.ps1 -EntrypointParameters @{ 'WatchDirectoryParameters' = @{ Path = 'C:\\src'; Destination = 'C:\\inetpub\\wwwroot'; DefaultExcludedFiles = @('.gitignore', '.gitkeep', '.dockerignore'); }}"
     volumes:
       - .\startup:C:\startup
-      - C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\Remote Debugger:C:\remote_debugger:ro
+      - C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\Remote Debugger:C:\remote_debugger:ro
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -24,15 +24,17 @@ services:
 
   cm:
     image: ${REGISTRY}sitecore-xm-cm:${SITECORE_VERSION}-windowsservercore-${WINDOWSSERVERCORE_VERSION}
-    entrypoint: powershell.exe -Command "& C:\\tools\\entrypoints\\iis\\Development.ps1 -WatchDirectoryParameters @{ Path = 'C:\\src'; Destination = 'C:\\inetpub\\wwwroot'; ExcludeDirectories = @('App_Data\\Unicorn'); }"
+    entrypoint: powershell.exe -Command "& C:\\tools\\entrypoints\\iis\\Development.ps1"
     ports:
       - "20001:80"
     volumes:
       - .\deploy:C:\src
       - .\unicorn:c:\inetpub\wwwroot\App_Data\Unicorn
       - .\data\cm:C:\inetpub\wwwroot\App_Data\logs
       - C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\Common7\IDE\Remote Debugger:C:\remote_debugger:ro
-      - C:\license:C:\license:ro 
+      - C:\license:C:\license:ro
+      - .\modules:C:\modules:ro
+      - .\releases:C:\inetpub\wwwroot\App_Data\packages
     networks:
       default:
         aliases:

diff --git a/src/Post_Build.ps1 b/src/Post_Build.ps1
@@ -102,7 +102,7 @@ foreach ( $site in $userConfig.sites )
             Write-Host -ForegroundColor Green "Copying from $deployFolder to $($site.path)"
             Write-Host
 
-            $filesToCopy = Get-ChildItem $deployFolder -Recurse -Exclude "*.example","*.disabled" | ? { $_.PSIsContainer -eq $False }
+            $filesToCopy = Get-ChildItem $deployFolder -Recurse | ? { $_.PSIsContainer -eq $False }
 
             if ($site.junction -and $deployProject.junctionPoints -ne $null) {
                 # Deploy any files that are not included in junction-folders

diff --git a/startup/startup.ps1 b/startup/startup.ps1
@@ -1,7 +1,8 @@
 [CmdletBinding()]
 param(
     [Parameter(Mandatory = $false)]
-    [string]$EntryPointScriptPath = "C:\tools\entrypoints\iis\Development.ps1"
+    [string]$EntrypointScriptPath = "C:\tools\entrypoints\iis\Development.ps1",
+    [hashtable]$EntrypointParameters
 )
 Write-Host "Running startup.ps1"
 Import-Module WebAdministration
@@ -35,5 +36,9 @@ foreach($hostheader in $hostHeaders) {
     Set-HttpBinding -SiteName $website -HostHeader $hostheader
 }
 
-Write-Host "Running $($EntryPointScriptPath)"
-& $EntryPointScriptPath
+Write-Host "Running $($EntrypointScriptPath)"
+if($EntrypointParameters) {
+    & $EntrypointScriptPath @EntrypointParameters
+} else {
+    & $EntrypointScriptPath
+}