Move tests Dockerfile image to the test directory. Rename docker-comp…

…ose.yml to docker-compose.tests.yml.
RDFLib · Jul 7, 2021 · 198c92f · 198c92f
1 parent d11e714
commit 198c92f
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 15 deletions.
diff --git a/Makefile b/Makefile
@@ -1,8 +1,10 @@
 tests:
-	docker compose up test-runner --exit-code-from test-runner
+	docker-compose -f docker-compose.tests.yml up test-runner
+	docker-compose -f docker-compose.tests.yml down
 
 build:
-	docker compose build
+	docker-compose -f docker-compose.tests.yml build
 
 coverage:
-	docker compose up test-runner-coverage --exit-code-from test-runner-coverage
+	docker-compose -f docker-compose.tests.yml up test-runner-coverage
+	docker-compose -f docker-compose.tests.yml down
diff --git a/docker-compose.tests.yml b/docker-compose.tests.yml
@@ -0,0 +1,16 @@
+services:
+  test-runner:
+    build:
+      context: .
+      dockerfile: test/Dockerfile
+    volumes:
+      - .:/rdflib
+    command: ["/rdflib/run_tests.sh"]
+
+  test-runner-coverage:
+    build:
+      context: .
+      dockerfile: test/Dockerfile
+    volumes:
+      - .:/rdflib
+    command: ["/rdflib/run_tests_with_coverage_report.sh"]
diff --git a/docker-compose.yml b/docker-compose.yml
diff --git a/Dockerfile → test/Dockerfile b/Dockerfile → test/Dockerfile