Skip to content
This repository was archived by the owner on Mar 11, 2020. It is now read-only.

Commit 1e19ec1

Browse files
authored
Merge pull request #48 from sixeyed/master
Bump FROM images to latest Windows versions
2 parents 684a958 + 9c9ce42 commit 1e19ec1

File tree

6 files changed

+25
-8
lines changed

6 files changed

+25
-8
lines changed

Image2Docker.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
RootModule = 'Image2Docker.psm1'
1313

1414
# Version number of this module.
15-
ModuleVersion = '1.8.0'
15+
ModuleVersion = '1.8.1'
1616

1717
# Supported PSEditions
1818
### NOTE: This module will not work with PowerShell Core.

README.md

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,14 @@ Windows Server 2016, or Windows 10 with the Anniversary Update is required to us
2525

2626
## Installation
2727

28-
Installing this PowerShell module from the PowerShell Gallery is very easy. Simply invoke ``Install-Module -Name Image2Docker`` in an administrative prompt.
29-
If you receive any errors, please validate the presence of the ``PowerShellGet`` module by running this command: ``Get-Command -Name PowerShellGet -ListAvailable``.
30-
You can also validate the presence of the ``Install-Module`` command by running: ``Get-Command -Module PowerShellGet -Name Install-Module``.
28+
Installing this PowerShell module from the PowerShell Gallery is very easy. In an administrative prompt run:
29+
30+
```
31+
Install-Module Image2Docker
32+
Import-Module Image2Docker
33+
```
34+
35+
You can validate the presence of the ``Install-Module`` command by running: ``Get-Command -Module PowerShellGet -Name Install-Module``.
3136
If the ``PowerShellGet`` module or the ``Install-Module`` commands are not accessible, you may not be running a supported version of PowerShell.
3237
Make sure that you are running PowerShell 5.0 or later on a Windows 10 client operating system.
3338

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# escape=`
2-
FROM microsoft/aspnet:3.5-windowsservercore-10.0.14393.693
2+
FROM microsoft/aspnet:3.5-windowsservercore-10.0.14393.1066
33
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
44

5+
# disable DNS cache so container addresses always fetched from Docker
6+
RUN Set-ItemProperty -path 'HKLM:\SYSTEM\CurrentControlSet\Services\Dnscache\Parameters' -Name ServerPriorityTimeLimit -Value 0 -Type DWord
7+
58
RUN Remove-Website 'Default Web Site';

Resources/Dockerfile-ASPNET.template

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# escape=`
2-
FROM microsoft/aspnet:windowsservercore-10.0.14393.693
2+
FROM microsoft/aspnet:windowsservercore-10.0.14393.1066
33
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
44

5+
# disable DNS cache so container addresses always fetched from Docker
6+
RUN Set-ItemProperty -path 'HKLM:\SYSTEM\CurrentControlSet\Services\Dnscache\Parameters' -Name ServerPriorityTimeLimit -Value 0 -Type DWord
7+
58
RUN Remove-Website 'Default Web Site';

Resources/Dockerfile-IIS.template

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# escape=`
2-
FROM microsoft/iis:windowsservercore-10.0.14393.693
2+
FROM microsoft/iis:windowsservercore-10.0.14393.1066
33
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
44

5+
# disable DNS cache so container addresses always fetched from Docker
6+
RUN Set-ItemProperty -path 'HKLM:\SYSTEM\CurrentControlSet\Services\Dnscache\Parameters' -Name ServerPriorityTimeLimit -Value 0 -Type DWord
7+
58
RUN Remove-Website 'Default Web Site';

Resources/Dockerfile.template

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
# escape=`
2-
FROM microsoft/windowsservercore
2+
FROM microsoft/windowsservercore:10.0.14393.1066
33
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
44

5+
# disable DNS cache so container addresses always fetched from Docker
6+
RUN Set-ItemProperty -path 'HKLM:\SYSTEM\CurrentControlSet\Services\Dnscache\Parameters' -Name ServerPriorityTimeLimit -Value 0 -Type DWord
7+
58
# Wait-Service is a tool from Microsoft for monitoring a Windows Service
69
ADD https://raw.githubusercontent.com/Microsoft/Virtualization-Documentation/live/windows-server-container-tools/Wait-Service/Wait-Service.ps1 /
710

0 commit comments

Comments
 (0)