Use correct test image names

chris-crone · chris-crone · commit 67f69cf8a7c8 · 2020-03-17T16:24:24.000+01:00
* Use the composespec namespace for the images
* Update the test Compose files to use the built images

Signed-off-by: Christopher Crone &lt;christopher.crone@docker.com&gt;
diff --git a/Makefile b/Makefile
@@ -13,7 +13,7 @@
 #   limitations under the License.
 
 PACKAGE=github.com/compose-spec/conformance-tests
-IMAGE_PREFIX=compose-spec/conformance-tests-
+IMAGE_PREFIX=composespec/conformance-tests-
 
 .DEFAULT_GOAL := help
 
diff --git a/tests/different_networks/compose.yaml b/tests/different_networks/compose.yaml
@@ -2,15 +2,13 @@ version: '3.7'
 
 services:
   entry:
-    image: test-server
-    build: ../../server
+    image: composespec/conformance-tests-server
     networks:
       - entrynetwork
     ports:
       - 8080:8080
   target:
-    image: test-server
-    build: ../../server
+    image: composespec/conformance-tests-server
     networks:
       - targetnetwork
 
diff --git a/tests/scaling/compose.yaml b/tests/scaling/compose.yaml
@@ -2,12 +2,10 @@ version: '3.7'
 
 services:
   server:
-    image: test-server
-    build: ../../server
+    image: composespec/conformance-tests-server
     ports:
       - 8080:8080
   client:
-    image: test-client
-    build: ../../client
+    image: composespec/conformance-tests-client
     deploy:
       replicas: 3
diff --git a/tests/simple_configfile/compose.yaml b/tests/simple_configfile/compose.yaml
@@ -1,7 +1,7 @@
 version: "3.7"
 services:
   entry:
-    image: test-server
+    image: composespec/conformance-tests-server
     ports:
       - 8080:8080
     configs:
diff --git a/tests/simple_lifecycle/compose.yaml b/tests/simple_lifecycle/compose.yaml
@@ -2,4 +2,4 @@ version: '3.7'
 
 services:
   test1:
-    image: test-server
+    image: composespec/conformance-tests-server
diff --git a/tests/simple_network/compose.yaml b/tests/simple_network/compose.yaml
@@ -2,15 +2,13 @@ version: '3.7'
 
 services:
   entry:
-    image: test-server
-    build: ../../server
+    image: composespec/conformance-tests-server
     networks:
       - mynetwork
     ports:
       - 8080:8080
   target:
-    image: test-server
-    build: ../../server
+    image: composespec/conformance-tests-server
     networks:
       - mynetwork
 
diff --git a/tests/simple_secretfile/compose.yaml b/tests/simple_secretfile/compose.yaml
@@ -1,7 +1,7 @@
 version: "3.7"
 services:
   entry:
-    image: test-server
+    image: composespec/conformance-tests-server
     ports:
       - 8080:8080
     secrets:
diff --git a/tests/simple_volume/compose.yaml b/tests/simple_volume/compose.yaml
@@ -1,7 +1,7 @@
 version: "3.7"
 services:
   entry:
-    image: test-server
+    image: composespec/conformance-tests-server
     ports:
       - 8080:8080
     volumes:
diff --git a/tests/udp_port/compose.yaml b/tests/udp_port/compose.yaml
@@ -2,7 +2,7 @@ version: '3.7'
 
 services:
   entry:
-    image: test-server
+    image: composespec/conformance-tests-server
     ports:
       - 8080:8080/tcp
       - target: 10001
