docker-library
/
hello-world
mirror of https://github.com/docker-library/hello-world.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update Windows with a PowerShell prompt and windowsservercore

This commit is contained in:
Tianon Gravi 2017-09-13 11:26:14 -07:00
parent e26832af4f
commit b63893caa6
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -13,7 +13,11 @@ $(C_TARGETS): hello.c
$(STRIP) -R .comment -s '$@' $(STRIP) -R .comment -s '$@'
@if [ '$(TARGET_ARCH)' = 'amd64' ]; then \ @if [ '$(TARGET_ARCH)' = 'amd64' ]; then \
mkdir -p '$(@D)/nanoserver'; \ mkdir -p '$(@D)/nanoserver'; \
'$@' | sed -e 's/an Ubuntu container/a Nano Server container/g' -e 's!ubuntu bash!microsoft/nanoserver powershell!g' > '$(@D)/nanoserver/hello.txt'; \ '$@' | sed \
-e 's/an Ubuntu container/a Windows Server container/g' \
-e 's!ubuntu bash!microsoft/windowsservercore powershell!g' \
-e 's![$$] docker!PS C:\\> docker!g' \
> '$(@D)/nanoserver/hello.txt'; \
fi fi
.PHONY: clean .PHONY: clean

4
amd64/hello-seattle/nanoserver/hello.txt
View File

@ -10,8 +10,8 @@ To generate this message, Docker took the following steps:
4. The Docker daemon streamed that output to the Docker client, which sent it 4. The Docker daemon streamed that output to the Docker client, which sent it
to your terminal. to your terminal.
To try something more ambitious, you can run a Nano Server container with: To try something more ambitious, you can run a Windows Server container with:
$ docker run -it microsoft/nanoserver powershell PS C:\> docker run -it microsoft/windowsservercore powershell
Share images, automate workflows, and more with a free Docker ID: Share images, automate workflows, and more with a free Docker ID:
https://cloud.docker.com/ https://cloud.docker.com/

4
amd64/hello-world/nanoserver/hello.txt
View File

@ -10,8 +10,8 @@ To generate this message, Docker took the following steps:
4. The Docker daemon streamed that output to the Docker client, which sent it 4. The Docker daemon streamed that output to the Docker client, which sent it
to your terminal. to your terminal.
To try something more ambitious, you can run a Nano Server container with: To try something more ambitious, you can run a Windows Server container with:
$ docker run -it microsoft/nanoserver powershell PS C:\> docker run -it microsoft/windowsservercore powershell
Share images, automate workflows, and more with a free Docker ID: Share images, automate workflows, and more with a free Docker ID:
https://cloud.docker.com/ https://cloud.docker.com/

4
amd64/hola-mundo/nanoserver/hello.txt
View File

@ -10,8 +10,8 @@ To generate this message, Docker took the following steps:
4. The Docker daemon streamed that output to the Docker client, which sent it 4. The Docker daemon streamed that output to the Docker client, which sent it
to your terminal. to your terminal.
To try something more ambitious, you can run a Nano Server container with: To try something more ambitious, you can run a Windows Server container with:
$ docker run -it microsoft/nanoserver powershell PS C:\> docker run -it microsoft/windowsservercore powershell
Share images, automate workflows, and more with a free Docker ID: Share images, automate workflows, and more with a free Docker ID:
https://cloud.docker.com/ https://cloud.docker.com/