summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdmond Chuc <e.chuc@uq.edu.au>2021-07-07 15:11:14 +1000
committerEdmond Chuc <e.chuc@uq.edu.au>2021-07-07 15:11:14 +1000
commit198c92f5eca53cee378ae9c2bffb61d8d3e29580 (patch)
tree42cf948387391870d3ad15fda55788b8ddfbf47b
parentd11e714fb7e9ba5343baf9c5e510e6a88b3a6d52 (diff)
downloadrdflib-198c92f5eca53cee378ae9c2bffb61d8d3e29580.tar.gz
Move tests Dockerfile image to the test directory. Rename docker-compose.yml to docker-compose.tests.yml.
-rw-r--r--Makefile8
-rw-r--r--docker-compose.tests.yml16
-rw-r--r--docker-compose.yml12
-rw-r--r--test/Dockerfile (renamed from Dockerfile)0
4 files changed, 21 insertions, 15 deletions
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/Dockerfile b/test/Dockerfile
index bb92a3b0..bb92a3b0 100644
--- a/Dockerfile
+++ b/test/Dockerfile