Skip to content

Commit d9cc4bd

Browse files
friismMano Marks
authored and
Mano Marks
committed
fix typo and shorted instructions (docker#79)
1 parent e1f43c9 commit d9cc4bd

File tree

2 files changed

+8
-21
lines changed

2 files changed

+8
-21
lines changed

windows/windows-containers/MultiContainerApp.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ This pulls in the right dependencies to the project.
105105
ADD samples samples
106106
RUN dotnet build .\samples\MusicStore.Standalone
107107
```
108-
This add the rest of the app source code to the container, and compiles the project
108+
This adds the rest of the app source code to the container, and compiles the project.
109109
```
110110
EXPOSE 5000
111111
ENV ASPNETCORE_URLS http://0.0.0.0:5000

windows/windows-containers/Setup.md

+7-20
Original file line numberDiff line numberDiff line change
@@ -24,26 +24,10 @@ Windows Server 2016 is the where Docker Windows containers should be deployed fo
2424
Once Windows Server 2016 is running, log in, run Windows Update to ensure you have all the latest updates and install the Windows-native Docker Engine directly (that is, not using “Docker for Windows”). Run the following in an Administrative PowerShell prompt:
2525

2626
```
27-
# Add the containers feature and restart
28-
Install-WindowsFeature containers
27+
Install-PackageProvider -Name NuGet -MinimumVersion 2.8.5.201 -Force
28+
Install-Module -Name DockerMsftProvider -Force
29+
Install-Package -Name docker -ProviderName DockerMsftProvider -Force
2930
Restart-Computer -Force
30-
31-
# Install the OneGet Powershell module
32-
Install-Module -Name DockerMsftProvider -Repository PSGallery -Force
33-
34-
# Install Docker and restart the computer
35-
Install-Package -Name docker -ProviderName DockerMsftProvider
36-
Restart-Computer -Force
37-
38-
# For quick use, does not require shell to be restarted.
39-
$env:path += ";c:\program files\docker"
40-
41-
# For persistent use, will apply even after a reboot.
42-
[Environment]::SetEnvironmentVariable("Path", $env:Path, [EnvironmentVariableTarget]::Machine)
43-
44-
# Start a new PowerShell prompt before proceeding
45-
dockerd --register-service
46-
Start-Service docker
4731
```
4832

4933
Docker Engine is now running as a Windows service, listening on the default Docker named pipe. For development VMs running (for example) in a Hyper-V VM on Windows 10, it might be advantageous to make the Docker Engine running in the Windows Server 2016 VM available to the Windows 10 host:
@@ -53,7 +37,10 @@ Docker Engine is now running as a Windows service, listening on the default Dock
5337
netsh advfirewall firewall add rule name="docker engine" dir=in action=allow protocol=TCP localport=2375
5438
5539
# Configure Docker daemon to listen on both pipe and TCP (replaces docker --register-service invocation above)
56-
dockerd.exe -H npipe:// -H 0.0.0.0:2375 --register-service
40+
Stop-Service docker
41+
dockerd --unregister-service
42+
dockerd -H npipe:// -H 0.0.0.0:2375 --register-service
43+
Start-Service docker
5744
```
5845

5946
The Windows Server 2016 Docker engine can now be used from the VM host by setting `DOCKER_HOST`:

0 commit comments

Comments
 (0)