Merge branch 'main' into bump-black-precommit

vipyrsec · Oct 4, 2023 · f0eb35b · f0eb35b
2 parents a779bf8 + d94d532
commit f0eb35b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 1 deletion.
diff --git a/Dockerfile → Containerfile b/Dockerfile → Containerfile
diff --git a/docker-compose-tests.yaml → compose-tests.yaml b/docker-compose-tests.yaml → compose-tests.yaml
@@ -4,6 +4,7 @@ services:
   mainframe:
     build:
       target: test
+      dockerfile: Containerfile
       args:
         GIT_SHA: testing
   db:

diff --git a/docker-compose.yaml → compose.yaml b/docker-compose.yaml → compose.yaml
@@ -4,6 +4,8 @@ services:
   mainframe:
     build:
       context: .
+      dockerfile: Containerfile
+
     ports:
       - "8000:8000"
     depends_on:

diff --git a/pyproject.toml b/pyproject.toml
@@ -57,7 +57,7 @@ docs = [
 [tool.pdm.scripts]
 format = { shell = "black . && isort ." }
 lint = { shell = "pyright; ruff ." }
-test = { shell = "docker compose -f docker-compose.yaml -f docker-compose-tests.yaml up --build --exit-code-from mainframe" }
+test = { shell = "docker compose -f compose.yaml -f compose-tests.yaml up --build --exit-code-from mainframe" }
 coverage = { shell = "coverage run -m pytest tests -vv && coverage report && coverage xml" }
 precommit = { shell = "pre-commit run --all-files" }
 all = { composite = ["format", "lint", "test"] }