Dockerfile cleanup and moved Single_IISAPP functionality into IIS

Signed-off-by: Elton Stoneman <elton@sixeyed.com>

Author: sixeyed

0

@@ -23,12 +23,12 @@ if ($Artifact.Status -eq 'Present') {
     $Result = '
     LABEL Description="Apache" Vendor="Docker Inc." Version="2.4.23"
     
-    RUN powershell.exe -ExecutionPolicy Bypass -Command mkdir $env:SystemDrive\Apache \
-      Invoke-WebRequest -Uri https://www.apachelounge.com/download/VC14/binaries/httpd-2.4.23-win64-VC14.zip -OutFile $env:TEMP\apache.zip \
-      Expand-Archive -Path $env:TEMP\apache.zip -DestinationPath c:\apache \
+    RUN mkdir $env:SystemDrive\Apache; `
+      Invoke-WebRequest -Uri https://www.apachelounge.com/download/VC14/binaries/httpd-2.4.23-win64-VC14.zip -OutFile $env:TEMP\apache.zip; `
+      Expand-Archive -Path $env:TEMP\apache.zip -DestinationPath c:\apache; `
       Remove-Item -Path $env:TEMP\Apache.zip
       
-      ENTRYPOINT ["c:\apache\apache24\bin\httpd.exe", "-w"]'
+    ENTRYPOINT ["c:\apache\apache24\bin\httpd.exe", "-w"]'
 
     Write-Verbose -Message ('Artifact is present: {0}. Adding text to Dockerfile {1}.' -f $ArtifactName, $Result)
 }

Functions/Private/Artifacts/Apache/Generate_Apache.ps1

@@ -20,7 +20,12 @@ $Manifest = '{0}\{1}.json' -f $ManifestPath, $ArtifactName
 $Artifact = Get-Content -Path $Manifest -Raw | ConvertFrom-Json
 
 if ($Artifact.Status -eq 'Present') {
-    $Result = 'RUN powershell.exe -ExecutionPolicy Bypass -Command Enable-WindowsOptionalFeature -Online -FeatureName DHCPServer'
+    $Result = 
+'RUN Enable-WindowsOptionalFeature -Online -FeatureName DHCPServer
+
+EXPOSE 67 2535
+
+CMD /Wait-Service.ps1 -ServiceName DHCPServer -AllowServiceRestart'
 }
 
 Write-Output -InputObject $Result

Functions/Private/Artifacts/DHCPServer/Generate_DHCPServer.ps1

@@ -20,7 +20,12 @@ $Manifest = '{0}\{1}.json' -f $ManifestPath, $ArtifactName
 $Artifact = Get-Content -Path $Manifest -Raw | ConvertFrom-Json
 
 if ($Artifact.Status -eq 'Enabled') {
-    $Result = 'RUN powershell.exe -ExecutionPolicy Bypass -Command Enable-WindowsOptionalFeature -Online -FeatureName DNS-Server-Full-Role'
+    $Result = 
+'RUN Enable-WindowsOptionalFeature -Online -FeatureName DNS-Server-Full-Role
+
+EXPOSE 53
+
+CMD /Wait-Service.ps1 -ServiceName DNS -AllowServiceRestart'
 }
 
 Write-Output -InputObject $Result

Functions/Private/Artifacts/DNSServer/Generate_DNSServer.ps1

@@ -8,14 +8,21 @@ The path where the Windows image was mounted to.
 
 .PARAMETER OutputPath
 The filesystem path where the discovery manifest will be emitted.
+
+.PARAMETER ArtifactParam
+Optional - one or more Website names to include in the output.
 #>
 [Diagnostics.CodeAnalysis.SuppressMessageAttribute("PSShouldProcess",'')]
 [CmdletBinding()]
 param (
     [Parameter(Mandatory = $true)]
     [string] $MountPath,
+
     [Parameter(Mandatory = $true)]
-    [string] $OutputPath
+    [string] $OutputPath,
+
+    [Parameter(Mandatory = $false)]
+    [string[]] $ArtifactParam
 )
 
 $ArtifactName = Split-Path -Path $PSScriptRoot -Leaf
@@ -31,12 +38,12 @@ $ManifestResult = @{
 }
 
 $WindowsFeatures = Get-WindowsOptionalFeature -Path $MountPath
-
 $IIS = $WindowsFeatures.Where{$_.FeatureName -eq 'IIS-WebServer'}
-
 $EnabledFeatures = $WindowsFeatures.Where{$_.State -eq 'Enabled'}
-
-$FeaturesToExport = $EnabledFeatures.Where{$_.FeatureName -match 'IIS'} | Sort-Object FeatureName | Select-Object -ExpandProperty FeatureName
+$FeaturesToExport = $EnabledFeatures.Where{$_.FeatureName -match 'IIS'-or 
+                                           $_.FeatureName -match 'ASPNET' -or 
+                                           $_.FeatureName -match 'Asp-Net' -and 
+                                           $_.FeatureName -NotMatch 'Management'} | Sort-Object FeatureName | Select-Object -ExpandProperty FeatureName
 
 if ($IIS.State -eq 'Enabled') {
 
@@ -47,6 +54,9 @@ if ($IIS.State -eq 'Enabled') {
     $applicationDefaults = $AllSites.applicationDefaults
     $virtualDirectoryDefaults = $AllSites.virtualDirectoryDefaults
     $sites = $AllSites.site
+    if ($ArtifactParam) {
+        $sites = $sites.where{$_.name -in $ArtifactParam }
+    }
     $Websites = New-Object System.Collections.ArrayList
     ForEach ($site in $sites) {        
        $Websites.add([PSCustomObject]@{ 
@@ -91,16 +101,24 @@ if ($IIS.State -eq 'Enabled') {
     $ManifestResult.SiteDefaults = $siteDefaults
     $ManifestResult.ApplicationDefaults = $applicationDefaults
     $ManifestResult.VirtualDirectoryDefaults = $virtualDirectoryDefaults
+
+    if ($ManifestResult.FeatureName -like '*ASPNET*' -or $ManifestResult.FeatureName -like '*Asp-Net*'){
+        Write-Verbose -Message 'ASP.NET is present on the system'
+        $ManifestResult.AspNetStatus = 'Present'
+    }
+    else {
+        Write-Verbose -Message 'ASP.NET is NOT present on the system'
+        $ManifestResult.AspNetStatus = 'Absent'
+    }
 }
 else {
     Write-Verbose -Message 'IIS service is NOT present on the system'
     $ManifestResult.Status = 'Absent'
+    $ManifestResult.AspNetStatus = 'Absent'
 }
 
 ### Write the result to the manifest file
 $ManifestResult | ConvertTo-Json -Depth 3 | Set-Content -Path $Manifest
 
 Write-Verbose -Message ('Finished discovering {0} artifact' -f $ArtifactName)
-}
-
-
+}

Functions/Private/Artifacts/IIS/Discover_IIS.ps1

@@ -5,13 +5,19 @@ Generates Dockerfile contents for Internet Information Services (IIS) feature
 
 .PARAMETER ManifestPath
 The filesystem path where the JSON manifests are stored.
+
+.PARAMETER ArtifactParam
+Optional - one or more Website names to include in the output.
 #>
 [Diagnostics.CodeAnalysis.SuppressMessageAttribute("PSShouldProcess",'')]
 [Diagnostics.CodeAnalysis.SuppressMessageAttribute("PSUseDeclaredVarsMoreThanAssignments",'')]
 [CmdletBinding()]
 param (
     [Parameter(Mandatory = $true)]
-    [string] $ManifestPath
+    [string] $ManifestPath,
+
+    [Parameter(Mandatory = $false)]
+    [string[]] $ArtifactParam
 )
 
 $ArtifactName = Split-Path -Path $PSScriptRoot -Leaf
@@ -25,40 +31,51 @@ if ($Artifact.Status -eq 'Present') {
     Write-Verbose ('Copying {0} configuration files' -f $ArtifactName)
     $ConfigPath = $MountPath + "\" + "Windows\System32\inetsrv\config"
     Copy-Item $ConfigPath $ManifestPath -Recurse
-    $Result = "RUN Enable-WindowsOptionalFeature -Online -FeatureName $($Artifact.FeatureName.Replace(';',',')) ; ``"
-    $EndOfLine = "`r`n"
-    $Add = "`r`n"
-    $Expose = 'EXPOSE '
-    $ExposePorts = New-Object System.Collections.ArrayList
-    $ExposeText = ''
-    [int]$SiteCount = $Artifact.Websites.Count;
-    for ($i=0;$i -lt $SiteCount;$i++) {
-        Write-Verbose -Message ('Creating new website for {0} site' -f $Artifact.Websites[$i].Name)
-        $SitePath = $MountPath + $Artifact.Websites[$i].PhysicalPath
-        $Result += $EndOfLine
-        $Result += 'New-Item -Path {0} -ItemType directory -Force; `' -f $Artifact.Websites[$i].PhysicalPath
-        $Result += $EndOfLine
-        $Result += 'New-Website -Name ''{0}'' -PhysicalPath "{1}" -Port {2} -Force; `' -f ($Artifact.Websites[$i].Name -replace "'","''"), $Artifact.Websites[$i].PhysicalPath, $Artifact.Websites[$i].binding.bindingInformation.split(':')[-2] 
-        $ExposePorts.Add($Artifact.Websites[$i].binding.bindingInformation.split(':')[-2]) | Out-Null  
-        Write-Verbose -Message ('Copying files for {0} site' -f $Artifact.Websites[$i].Name)
-        Copy-Item $SitePath $ManifestPath -Recurse
-        $Add += "ADD {0} {1}`r`n" -f (Split-Path $Artifact.Websites[$i].PhysicalPath -Leaf),($Artifact.Websites[$i].PhysicalPath -Replace "\\","/") 
+
+    $ResultBuilder = New-Object System.Text.StringBuilder
+
+    Write-Verbose -Message ('Writing instruction to install IIS')
+    $null = $ResultBuilder.AppendLine('# Install Windows features for IIS')
+    $null = $ResultBuilder.Append('RUN Add-WindowsFeature Web-server')
+    if ($Artifact.AspNetStatus -eq 'Present') {
+        Write-Verbose -Message ('Writing instruction to install ASP.NET')
+        $null = $ResultBuilder.Append(', NET-Framework-45-ASPNET, Web-Asp-Net45')
     }
+    $null = $ResultBuilder.AppendLine('')
+    $null = $ResultBuilder.AppendLine("RUN Enable-WindowsOptionalFeature -Online -FeatureName $($Artifact.FeatureName.Replace(';',','))")
 
-$Result += $EndOfLine
-    ### Add IIS HTTP handlers to the Dockerfile
-    foreach ($HttpHandler in $Artifact.HttpHandlers) {
-        $Result += 'New-WebHandler -Name "{0}" -Path "{1}" -Verb "{2}" `' -f $HttpHandler.Name, $HttpHandler.Path, $HttpHandler.Verb
-        $Result += $EndOfLine   
-}
-    $Add += "ADD config Windows/System32/inetsrv/"
+    if ($Artifact.HttpHandlers.Count > 0) {
+        Write-Verbose -Message ('Writing instruction to add HTTP handlers')
+        $null = $ResultBuilder.Append('RUN ')
+        foreach ($HttpHandler in $Artifact.HttpHandlers) {
+             $null = $ResultBuilder.AppendLine('New-WebHandler -Name "{0}" -Path "{1}" -Verb "{2}" `' -f $HttpHandler.Name, $HttpHandler.Path, $HttpHandler.Verb)
+        }
+    }
+    $null = $ResultBuilder.AppendLine('')
 
-$ExposeText += $EndOfLine
-$ExposePorts.ForEach{$ExposeText += "$Expose $_ $EndOfLine" }    
-$endOutput = ($Result + $Add + $ExposeText)
-Write-Output $endOutput -NoEnumerate
-    
+    for ($i=0;$i -lt $Artifact.Websites.Count;$i++) {
+        $Site = $Artifact.Websites[$i]
+        Write-Verbose -Message ('Writing instruction to copy files for {0} site' -f  $Site.Name)
+        $null = $ResultBuilder.AppendLine("# Set up website: $($Site.Name)")
+        $SitePath = $MountPath + $Site.PhysicalPath
+        Copy-Item $SitePath $ManifestPath -Recurse
+        $copy = "COPY {0} {1}" -f (Split-Path $Site.PhysicalPath -Leaf),($Site.PhysicalPath -Replace "\\","/")
+        $null = $ResultBuilder.AppendLine($copy)
+
+        Write-Verbose -Message ('Writing instruction to create site {0}' -f  $Site.Name)
+        $newSite = 'RUN New-Website -Name ''{0}'' -PhysicalPath "C:{1}" -Port {2} -Force' -f ($Site.Name -replace "'","''"), $Site.PhysicalPath, $Site.binding.bindingInformation.split(':')[-2]
+        $null = $ResultBuilder.AppendLine($newSite)
+
+        Write-Verbose -Message ('Writing instruction to expose port for site {0}' -f  $Site.Name)
+        $null = $ResultBuilder.AppendLine("EXPOSE $($Site.binding.bindingInformation.split(':')[-2])")
+        $null = $ResultBuilder.AppendLine('')
+    }
+        
+    $null = $ResultBuilder.AppendLine('CMD /Wait-Service.ps1 -ServiceName W3SVC -AllowServiceRestart')
 }
 
+
+Write-Output $ResultBuilder.ToString() -NoEnumerate
+
 }
 

Functions/Private/Artifacts/IIS/Generate_IIS.ps1

@@ -27,14 +27,17 @@ $Manifest = '{0}\{1}.json' -f $OutputPath, $ArtifactName
 ### Create a HashTable to store the results (this will get persisted to JSON)
 $ManifestResult = @{
     Name = 'MSMQ'
+    FeatureName = ''
     Status = ''
 }
 
-$MSMQ = Get-WindowsOptionalFeature -FeatureName MSMQ-Server -Path $MountPath 
-
-if ($MSMQ.State -eq 'Enabled') {
+$MsmqFeatures = Get-WindowsOptionalFeature -FeatureName MSMQ* -Path $MountPath 
+$EnabledFeatures = $MsmqFeatures.Where{$_.State -eq 'Enabled'}
+if ($EnabledFeatures.Count -gt 0) {
     Write-Verbose -Message 'MSMQ service is present'
     $ManifestResult.Status = 'Present'
+    $FeaturesToExport = $enabledFeatures | Sort-Object FeatureName | Select-Object -ExpandProperty FeatureName
+    $ManifestResult.FeatureName = $FeaturesToExport  -join ';'
 }
 else {
     Write-Verbose -Message 'MSMQ service was not found'

Functions/Private/Artifacts/MSMQ/Discover_MSMQ.ps1

@@ -20,10 +20,12 @@ $Manifest = '{0}\{1}.json' -f $ManifestPath, $ArtifactName
 $Artifact = Get-Content -Path $Manifest -Raw | ConvertFrom-Json
 
 if ($Artifact.Status -eq 'Present') {
-    $Result = '
-RUN powershell.exe -ExecutionPolicy Bypass -Command Enable-WindowsOptionalFeature -Online -FeatureName MSMQ-Server
+    $Result = "RUN Enable-WindowsOptionalFeature -Online -FeatureName $($Artifact.FeatureName.Replace(';',',')) ;"
+    $Result += [System.Environment]::NewLine
+    $Result += 'EXPOSE 135 389 1801
+
+CMD /Wait-Service.ps1 -ServiceName MSMQ -AllowServiceRestart'
 
-ENTRYPOINT ["ping", "8.8.8.8", "-t"]'
     Write-Output -InputObject $Result
 }