diff --git a/dockerfiles/Dockerfile b/dockerfiles/Dockerfile index 865bc8db..97a45a88 100644 --- a/dockerfiles/Dockerfile +++ b/dockerfiles/Dockerfile @@ -1,11 +1,16 @@ -# 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}" \ - && git clone -b ${MICROSERVICES_VERSION} https://github.com/DUNE-DAQ/microservices.git \ - && cp microservices/entrypoint.sh / + +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