ci: use default builder for docker-compose

Otherwise the docker compose does not seem to have access to the locallly loaded image from the build step.
acsone · Sep 19, 2024 · 1957cdd · 1957cdd
1 parent 66b1d39
commit 1957cdd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -131,6 +131,7 @@ jobs:
           ODOOVERSION: "${{ matrix.ODOOVERSION }}"
           PYTHONTAG: "${{ matrix.PYTHONTAG }}"
           DISTRO: "${{ matrix.DISTRO }}"
+          BUILDER: "default"
         run: pytest -v tests
       - name: Login to ghcr.io
         uses: docker/login-action@v3

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -19,6 +19,8 @@ def compose_build():
         cmd.extend(["--build-arg", f"PYTHONTAG={os.environ['PYTHONTAG']}"])
     if "DISTRO" in os.environ:
         cmd.extend(["--build-arg", f"DISTRO={os.environ['DISTRO']}"])
+    if "BUILDER" in os.environ:
+        cmd.extend(["--builder", os.environ["BUILDER"]])
     subprocess.run(cmd, check=True, cwd=HERE)