Additional changes to account for incompatible image

Author: eimlav

spec/acceptance/compose_v3_spec.rb

@@ -5,7 +5,11 @@
   file_extension = '.exe'
   docker_args = 'docker_ee => true'
   tmp_path = 'C:/cygwin64/tmp'
-  test_container = 'nanoserver-sac2016'
+  if fact('os.release.major') == '2019'
+    test_container = 'nanoserver'
+  else
+    test_container = 'nanoserver-sac2016'
+  end
 else
   docker_args = if fact('os.name') == 'RedHat'
                   "repo_opt => '--enablerepo=localmirror-extras'"

spec/acceptance/docker_full_spec.rb

@@ -3,7 +3,11 @@
 if fact('kernel') == 'windows'
   docker_args = 'docker_ee => true'
   default_image = 'winamd64/hello-seattle'
-  default_image_tag = 'nanoserver-sac2016'
+  if fact('os.release.major') == '2019'
+    default_image_tag = 'nanoserver'
+  else
+    default_image_tag = 'nanoserver-sac2016'
+  end
   default_digest = 'sha256:dcba85354678b50608b8c40ec6d17cce063a224aa0e12b6a55dc47b67f039e75'
   second_image = 'winamd64/hola-mundo'
   default_dockerfile = 'C:/Users/Administrator/AppData/Local/Temp/Dockerfile'

spec/spec_helper_acceptance.rb

@@ -135,6 +135,17 @@ def retry_on_error_matching(max_retry_count = 3, retry_wait_interval_secs = 5, e
       EOS
       docker_compose_override_v3_windows = <<-EOS
 version: "3"
+services:
+  compose_test:
+    image: winamd64/hello-seattle:nanoserver
+    command: cmd.exe /C "ping 8.8.8.8 -t"
+networks:
+  default:
+    external:
+      name: nat
+      EOS
+      docker_compose_override_v3_windows_2016 = <<-EOS
+version: "3"
 services:
   compose_test:
     image: winamd64/hello-seattle:nanoserver-sac2016
@@ -153,15 +164,26 @@ def retry_on_error_matching(max_retry_count = 3, retry_wait_interval_secs = 5, e
       EOS
       docker_stack_override_windows = <<-EOS
 version: "3"
+services:
+  compose_test:
+    image: winamd64/hello-seattle:nanoserver
+      EOS
+      docker_stack_override_windows_2016 = <<-EOS
+version: "3"
 services:
   compose_test:
     image: winamd64/hello-seattle:nanoserver-sac2016
       EOS
       if fact_on(host, 'osfamily') == 'windows'
         create_remote_file(host, '/tmp/docker-compose-v3.yml', docker_compose_content_v3_windows)
         create_remote_file(host, '/tmp/docker-stack.yml', docker_stack_content_windows)
-        create_remote_file(host, '/tmp/docker-compose-override-v3.yml', docker_compose_override_v3_windows)
-        create_remote_file(host, '/tmp/docker-stack-override.yml', docker_stack_override_windows)
+        if fact_on(host, 'os.release.major') == '2019'
+          create_remote_file(host, '/tmp/docker-compose-override-v3.yml', docker_stack_override_windows)
+          create_remote_file(host, '/tmp/docker-stack-override.yml', docker_stack_override_windows)
+        else
+          create_remote_file(host, '/tmp/docker-compose-override-v3.yml', docker_stack_override_windows_2016)
+          create_remote_file(host, '/tmp/docker-stack-override.yml', docker_stack_override_windows_2016)
+        end
       else
         create_remote_file(host, '/tmp/docker-compose-v3.yml', docker_compose_content_v3)
         create_remote_file(host, '/tmp/docker-stack.yml', docker_compose_content_v3)