diff --git a/.dockerignore b/.dockerignore index a36d767a4..4d11019ae 100644 --- a/.dockerignore +++ b/.dockerignore @@ -21,7 +21,7 @@ CHANGELOG.md ci CODE_OF_CONDUCT.rst CONTRIBUTING.rst -docker-bake.hcl +server/docker-bake.hcl docs LICENSE lint.mk diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 8cabc30a8..ca93b32df 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -37,8 +37,10 @@ jobs: uses: docker/bake-action@v7.5.0 with: call: check + files: server/docker-bake.hcl - name: Build Docker images uses: docker/bake-action@v7.5.0 with: push: false + files: server/docker-bake.hcl diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1eec87048..ea17d0046 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -155,5 +155,6 @@ jobs: uses: docker/bake-action@v7.5.0 with: push: true + files: server/docker-bake.hcl env: VERSION: ${{ needs.release.outputs.version }} diff --git a/pyproject.toml b/pyproject.toml index 05011d969..6f1d3c3ab 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -365,7 +365,6 @@ ignore = [ "CODE_OF_CONDUCT.rst", "conftest.py", "CONTRIBUTING.rst", - "docker-bake.hcl", "docs", "docs/**", "LICENSE", @@ -375,6 +374,7 @@ ignore = [ "newsfragments/**", "prek.toml", "secrets.tar.gpg", + "server/docker-bake.hcl", "server/Dockerfile", "server/tests/**", "spelling_private_dict.txt", diff --git a/server/README.rst b/server/README.rst index 92edf5ac4..682ca9492 100644 --- a/server/README.rst +++ b/server/README.rst @@ -58,3 +58,16 @@ The Docker tests build and start all three services and require a running Docker For the Flask and health-check cases alone, add ``--skip-marker=requires_docker_build``. The shared fixtures are loaded explicitly from the installed contract package. Shared API assertions remain maintained in that package. + +Building container images +------------------------- + +From the workspace root, build the three service targets with the server's bake definition: + +.. code-block:: console + + $ docker buildx bake --file server/docker-bake.hcl + +The default group builds ``linux/amd64`` and ``linux/arm64`` images. +The ``VERSION`` variable selects the version tag alongside ``latest``. +The image names and service targets remain the same. diff --git a/docker-bake.hcl b/server/docker-bake.hcl similarity index 100% rename from docker-bake.hcl rename to server/docker-bake.hcl diff --git a/server/tests/vws_mock_server_tests/test_docker.py b/server/tests/vws_mock_server_tests/test_docker.py index 8cd1b784f..a52959199 100644 --- a/server/tests/vws_mock_server_tests/test_docker.py +++ b/server/tests/vws_mock_server_tests/test_docker.py @@ -378,7 +378,7 @@ def fixture_mock_deployment() -> Iterator[_MockDeployment]: """ repository_root = str( object=find_root( - criterion=has_file(file="docker-bake.hcl"), + criterion=has_file(file="uv.lock"), start=Path(__file__).resolve(), ) )