From 198c92f5eca53cee378ae9c2bffb61d8d3e29580 Mon Sep 17 00:00:00 2001
From: Edmond Chuc <e.chuc@uq.edu.au>
Date: Wed, 7 Jul 2021 15:11:14 +1000
Subject: Move tests Dockerfile image to the test directory. Rename
 docker-compose.yml to docker-compose.tests.yml.

---
 Dockerfile               | 12 ------------
 Makefile                 |  8 +++++---
 docker-compose.tests.yml | 16 ++++++++++++++++
 docker-compose.yml       | 12 ------------
 test/Dockerfile          | 12 ++++++++++++
 5 files changed, 33 insertions(+), 27 deletions(-)
 delete mode 100644 Dockerfile
 create mode 100644 docker-compose.tests.yml
 delete mode 100644 docker-compose.yml
 create mode 100644 test/Dockerfile

diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index bb92a3b0..00000000
--- a/Dockerfile
+++ /dev/null
@@ -1,12 +0,0 @@
-# Docker image for the rdflib test-runner.
-
-# Use the lowest supported Python version to run tests.
-FROM python:3.6
-
-COPY requirements.dev.txt .
-COPY requirements.txt .
-
-RUN pip install --no-cache -r requirements.dev.txt
-RUN pip install --no-cache -r requirements.txt
-
-WORKDIR /rdflib
diff --git a/Makefile b/Makefile
index cd9d8032..7c484cfc 100644
--- 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
\ No newline at end of file
+	docker-compose -f docker-compose.tests.yml up test-runner-coverage
+	docker-compose -f docker-compose.tests.yml down
\ No newline at end of file
diff --git a/docker-compose.tests.yml b/docker-compose.tests.yml
new file mode 100644
index 00000000..c71e3143
--- /dev/null
+++ 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"]
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
deleted file mode 100644
index 0103edcc..00000000
--- a/docker-compose.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-services:
-  test-runner:
-    build: .
-    volumes:
-      - .:/rdflib
-    command: ["/rdflib/run_tests.sh"]
-
-  test-runner-coverage:
-    build: .
-    volumes:
-      - .:/rdflib
-    command: ["/rdflib/run_tests_with_coverage_report.sh"]
\ No newline at end of file
diff --git a/test/Dockerfile b/test/Dockerfile
new file mode 100644
index 00000000..bb92a3b0
--- /dev/null
+++ b/test/Dockerfile
@@ -0,0 +1,12 @@
+# Docker image for the rdflib test-runner.
+
+# Use the lowest supported Python version to run tests.
+FROM python:3.6
+
+COPY requirements.dev.txt .
+COPY requirements.txt .
+
+RUN pip install --no-cache -r requirements.dev.txt
+RUN pip install --no-cache -r requirements.txt
+
+WORKDIR /rdflib
-- 
cgit v1.2.1