docker cleanups

Author: ktoso

docker/docker-compose.2004.55.yaml

@@ -11,7 +11,8 @@ services:
 
   test:
     image: swift-metrics:20.04-5.5
-    environment: []
+    environment:
+      - FORCE_TEST_DISCOVERY=--enable-test-discovery
       #- SANITIZER_ARG=--sanitize=thread
 
   shell:

docker/docker-compose.2004.56.yaml

@@ -0,0 +1,19 @@
+version: "3"
+
+services:
+
+  runtime-setup:
+    image: swift-metrics:20.04-5.6
+    build:
+      args:
+        ubuntu_version: "focal"
+        swift_version: "5.6"
+
+  test:
+    image: swift-metrics:20.04-5.6∂
+    environment:
+      - FORCE_TEST_DISCOVERY=--enable-test-discovery
+      #- SANITIZER_ARG=--sanitize=thread
+
+  shell:
+    image: swift-metrics:20.04-5.6

docker/docker-compose.2004.57.yaml

@@ -0,0 +1,19 @@
+version: "3"
+
+services:
+
+  runtime-setup:
+    image: swift-metrics:20.04-5.7
+    build:
+      args:
+        ubuntu_version: "focal"
+        swift_version: "5.7"
+
+  test:
+    image: swift-metrics:20.04-5.7
+    environment:
+      - FORCE_TEST_DISCOVERY=--enable-test-discovery
+      #- SANITIZER_ARG=--sanitize=thread
+
+  shell:
+    image: swift-metrics:20.04-5.7

docker/docker-compose.yaml

@@ -26,15 +26,9 @@ services:
     <<: *common
     command: /bin/bash -xcl "./scripts/soundness.sh"
 
-  docs:
-    <<: *common
-    environment:
-      - CI
-    command: /bin/bash -xcl "./scripts/generate_docs.sh"
-
   test:
     <<: *common
-    command: /bin/bash -xcl "swift test -Xswiftc -warnings-as-errors $${SANITIZER_ARG-}"
+    command: /bin/bash -xcl "swift test -Xswiftc -warnings-as-errors $${FORCE_TEST_DISCOVERY-} $${SANITIZER_ARG-}"
 
   # util