From 3b9e3d15d5a2c539492a957e5c27e71c72dfe8d1 Mon Sep 17 00:00:00 2001 From: Robin5605 Date: Tue, 3 Oct 2023 13:17:12 -0500 Subject: [PATCH 1/4] Rename Dockerfile to Containerfile --- Dockerfile => Containerfile | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Dockerfile => Containerfile (100%) diff --git a/Dockerfile b/Containerfile similarity index 100% rename from Dockerfile rename to Containerfile From 14123f41bd46984f0dd347b2457b5ea5e4715e97 Mon Sep 17 00:00:00 2001 From: Robin5605 Date: Tue, 3 Oct 2023 13:24:37 -0500 Subject: [PATCH 2/4] Rename compose files too --- docker-compose-tests.yaml => compose-tests.yaml | 0 docker-compose.yaml => compose.yaml | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename docker-compose-tests.yaml => compose-tests.yaml (100%) rename docker-compose.yaml => compose.yaml (100%) diff --git a/docker-compose-tests.yaml b/compose-tests.yaml similarity index 100% rename from docker-compose-tests.yaml rename to compose-tests.yaml diff --git a/docker-compose.yaml b/compose.yaml similarity index 100% rename from docker-compose.yaml rename to compose.yaml From 47f7ad96eee781f33948f4c41f347e6990dadca7 Mon Sep 17 00:00:00 2001 From: Robin5605 Date: Tue, 3 Oct 2023 13:25:26 -0500 Subject: [PATCH 3/4] Modify pdm scripts to use new filenames --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 8d4f441f..6ded63ea 100644 --- 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"] } From 37a4747d8144e0d29d4d338e53b73c6d85fb9cf3 Mon Sep 17 00:00:00 2001 From: Robin5605 Date: Tue, 3 Oct 2023 13:41:53 -0500 Subject: [PATCH 4/4] Specify Containerfile in compose files --- compose-tests.yaml | 1 + compose.yaml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/compose-tests.yaml b/compose-tests.yaml index 4074f521..af517c0a 100644 --- a/compose-tests.yaml +++ b/compose-tests.yaml @@ -4,6 +4,7 @@ services: mainframe: build: target: test + dockerfile: Containerfile args: GIT_SHA: testing db: diff --git a/compose.yaml b/compose.yaml index 4b615f71..4d633a88 100644 --- a/compose.yaml +++ b/compose.yaml @@ -4,6 +4,8 @@ services: mainframe: build: context: . + dockerfile: Containerfile + ports: - "8000:8000" depends_on: