Merge pull request #41 from infosiftr/sac2016

Use new microsoft/nanoserver tags (sac2016)

Author: yosifkit

.dockerignore

@@ -1,7 +1,7 @@
 *.md
 *.sh
 **/hello
-**/nanoserver/hello.txt
+**/nanoserver*/hello.txt
 .dockerignore
 .git
 Dockerfile*

.travis.yml

@@ -10,7 +10,7 @@ before_script:
 
 script:
   - ./update.sh
-  - test -z "$(git status --porcelain '**/hello' '**/nanoserver/hello.txt')"
+  - test -z "$(git status --porcelain '**/hello' '**/nanoserver*/hello.txt')"
   - travis_retry docker build -t "$image" amd64/hello-world
   - ~/official-images/test/run.sh "$image"
 

Makefile

@@ -12,7 +12,7 @@ $(C_TARGETS): hello.c
 	$(CC) $(CFLAGS) -o '$@' -D DOCKER_IMAGE='"$(notdir $(@D))"' -D DOCKER_GREETING="\"$$(cat 'greetings/$(notdir $(@D)).txt')\"" -D DOCKER_ARCH='"$(TARGET_ARCH)"' '$<'
 	$(STRIP) -R .comment -s '$@'
 	@if [ '$(TARGET_ARCH)' = 'amd64' ]; then \
-		for winVariant in nanoserver nanoserver1709; do \
+		for winVariant in nanoserver-sac2016 nanoserver-1709; do \
 			mkdir -p "$(@D)/$$winVariant"; \
 			'$@' | sed \
 				-e 's/[(]$(TARGET_ARCH)[)]/(windows-$(TARGET_ARCH))/g' \

amd64/hello-seattle/nanoserver1709/Dockerfile renamed to amd64/hello-seattle/nanoserver-1709/Dockerfile

@@ -1,3 +1,3 @@
-FROM microsoft/nanoserver
+FROM microsoft/nanoserver:sac2016
 COPY hello.txt C:
 CMD ["cmd", "/C", "type C:\\hello.txt"]

amd64/hello-seattle/nanoserver/hello.txt renamed to amd64/hello-seattle/nanoserver-1709/hello.txt

@@ -1,3 +1,3 @@
-FROM microsoft/nanoserver
+FROM microsoft/nanoserver:sac2016
 COPY hello.txt C:
 CMD ["cmd", "/C", "type C:\\hello.txt"]

amd64/hello-seattle/nanoserver/Dockerfile renamed to amd64/hello-seattle/nanoserver-sac2016/Dockerfile

@@ -1,3 +1,3 @@
-FROM microsoft/nanoserver
+FROM microsoft/nanoserver:sac2016
 COPY hello.txt C:
 CMD ["cmd", "/C", "type C:\\hello.txt"]

amd64/hello-seattle/nanoserver1709/hello.txt renamed to amd64/hello-seattle/nanoserver-sac2016/hello.txt

@@ -62,15 +62,15 @@ for arch in "${arches[@]}"; do
 	EOE
 done
 
-for winVariant in nanoserver nanoserver1709; do
+for winVariant in nanoserver-sac2016 nanoserver-1709; do
 	winArches=( *"/$image/$winVariant/hello.txt" )
 	winArches=( "${winArches[@]%"/$image/$winVariant/hello.txt"}" )
 
 	if [ "${#winArches[@]}" -gt 0 ]; then
 		echo
 		cat <<-EOE
 			Tags: $winVariant
-			SharedTags: latest
+			SharedTags: nanoserver, latest
 			Architectures: $(join ', ' "${winArches[@]/#/windows-}")
 		EOE
 		for arch in "${winArches[@]}"; do

amd64/hello-world/nanoserver1709/Dockerfile renamed to amd64/hello-world/nanoserver-1709/Dockerfile

@@ -7,7 +7,7 @@ set -x
 
 docker build -f Dockerfile.build -t hello-world:build .
 
-rm -rf */hello */nanoserver/hello.txt
+rm -rf */hello */nanoserver*/hello.txt
 docker run --rm hello-world:build sh -c 'find \( -name hello -or -name hello.txt \) -print0 | xargs -0 tar --create' | tar --extract --verbose
 
 for h in amd64/*/hello; do