From 1fdf367c071360a44a2172be09500a5a51e0ccbc Mon Sep 17 00:00:00 2001 From: Pat Riehecky Date: Mon, 2 Feb 2026 10:29:15 -0600 Subject: [PATCH 1/2] Support older git --- dockerfiles/Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dockerfiles/Dockerfile b/dockerfiles/Dockerfile index 865bc8db..f4b9f5fd 100644 --- a/dockerfiles/Dockerfile +++ b/dockerfiles/Dockerfile @@ -4,8 +4,10 @@ FROM ghcr.io/dune-daq/microservices_dependencies:$DEPENDENCY_TAG ARG MICROSERVICES_VERSION=develop RUN : "${APP_ROOT:?APP_ROOT variable is required}" \ - && git clone -b ${MICROSERVICES_VERSION} https://github.com/DUNE-DAQ/microservices.git \ - && cp microservices/entrypoint.sh / + && git clone https://github.com/DUNE-DAQ/microservices.git \ + && cd microservices \ + && git checkout ${MICROSERVICES_VERSION} \ + && cp ./entrypoint.sh / WORKDIR ${APP_ROOT}/microservices From ff226e56a2d1f9bc5654c4d088208cdeb3a4e9d9 Mon Sep 17 00:00:00 2001 From: Pat Riehecky Date: Mon, 2 Feb 2026 10:32:14 -0600 Subject: [PATCH 2/2] Add more verbose output on container build --- dockerfiles/Dockerfile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dockerfiles/Dockerfile b/dockerfiles/Dockerfile index f4b9f5fd..97a45a88 100644 --- a/dockerfiles/Dockerfile +++ b/dockerfiles/Dockerfile @@ -1,12 +1,15 @@ -# Must define DEPENDENCY_TAG before it is used +# Must define DEPENDENCY_TAG before it is used, gets undefined after FROM ARG DEPENDENCY_TAG=latest FROM ghcr.io/dune-daq/microservices_dependencies:$DEPENDENCY_TAG ARG MICROSERVICES_VERSION=develop -RUN : "${APP_ROOT:?APP_ROOT variable is required}" \ + +RUN echo "FROM ghcr.io/dune-daq/microservices_dependencies" \ && git clone https://github.com/DUNE-DAQ/microservices.git \ && cd microservices \ + && echo "https://github.com/DUNE-DAQ/microservices.git -> ${MICROSERVICES_VERSION}" \ && git checkout ${MICROSERVICES_VERSION} \ + && : "${APP_ROOT:?APP_ROOT variable is required}" \ && cp ./entrypoint.sh / WORKDIR ${APP_ROOT}/microservices