From 8345f1554fa90ed38513183795b1158bbc880725 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 2 Jan 2026 18:51:34 +0000 Subject: [PATCH 1/2] Initial plan From 6bc6b6cc85ff5dd60051a55a74e61493c97001fa Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 2 Jan 2026 18:58:29 +0000 Subject: [PATCH 2/2] Fix GitHub Actions workflows to specify Dockerfile paths and update documentation Co-authored-by: jcpunk <3534830+jcpunk@users.noreply.github.com> --- .github/workflows/build_docker_dependencies_image.yml | 1 + .github/workflows/build_docker_image.yml | 1 + docs/README.md | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_docker_dependencies_image.yml b/.github/workflows/build_docker_dependencies_image.yml index 9b61c539..049e156d 100644 --- a/.github/workflows/build_docker_dependencies_image.yml +++ b/.github/workflows/build_docker_dependencies_image.yml @@ -47,6 +47,7 @@ jobs: uses: docker/build-push-action@v3 with: context: ${{ github.workspace }}/microservices/ + file: ${{ github.workspace }}/microservices/dockerfiles/Dockerfile.dependencies push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} diff --git a/.github/workflows/build_docker_image.yml b/.github/workflows/build_docker_image.yml index f3f1b480..b38518e8 100644 --- a/.github/workflows/build_docker_image.yml +++ b/.github/workflows/build_docker_image.yml @@ -47,6 +47,7 @@ jobs: uses: docker/build-push-action@v3 with: context: ${{ github.workspace }}/microservices/ + file: ${{ github.workspace }}/microservices/dockerfiles/Dockerfile push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} diff --git a/docs/README.md b/docs/README.md index 64000ee7..bc948978 100644 --- a/docs/README.md +++ b/docs/README.md @@ -6,7 +6,7 @@ docker run --rm -e MICROSERVICE= ghcr.io/dune-daq/microser ``` There are a couple of points to note: -* The value of MICROSERVICE should be the name of a given microservice's subdirectory in this repo. As of Jul-25-2024, the available subdirectories are: `config-service`, `elisa-logbook`, `ers-dbwriter`, `ers-protobuf-dbwriter`, `opmon-dbwriter` (now deprecated), `opmon-protobuf-dbwriter`, `runnumber-rest` and `runregistry-rest`. +* The value of MICROSERVICE should be the name of a given microservice's subdirectory in this repo. As of Jan-2-2026, the available subdirectories are: `elisa-logbook`, `ers-protobuf-dbwriter`, `opmon-protobuf-dbwriter`, `runnumber-rest` and `runregistry-rest`. * Most microservices require additional environment variables to be set, which can be passed using the usual docker syntax: `-e VARIABLE_NAME=` * If you don't know what these additional environment variables are, you can just run the `docker` command as above without setting them; the container will exit out almost immediately but only after telling you what variables are missing * The microservices image tag will be `microservices:` or `microservices:`, i.e. `microservices:develop`. @@ -29,7 +29,7 @@ docker push ghcr.io/dune-daq/microservices:user-my-branch and ```bash -docker build -f dockerfiles/Dockerfile.dependencies -t ghcr.io/dune-daq/microservices_dependencies:user-my-branch /dockerfiles +docker build -f dockerfiles/Dockerfile.dependencies -t ghcr.io/dune-daq/microservices_dependencies:user-my-branch ./dockerfiles docker push ghcr.io/dune-daq/microservices_dependencies:user-my-branch ```