diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7e3ca9cb5b0bb968575233ca15d3a05035c1b669..eea5599cb684cd01f108b5c713dd4c10785ed7d0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -36,7 +36,7 @@ versioning: - git fetch --unshallow - ./Docker/fetch_latest_commits.sh | tee commits.txt > versions.env # TODO: pinned version for DP3 - - echo DP3_COMMIT=b493728441362eb15e5ee7dd1bd824c97844d700 >> versions.env + - echo DP3_COMMIT=123e194b135efd5fd471ff5817c7af6d1ae48bb8 >> versions.env - echo LINC_VERSION=$(git describe --tags --always) >> versions.env # Use hash of commits to determine version of base image (and rebuild if necessary) - echo INTEGRATION_BASE_IMAGE=${CI_REGISTRY_IMAGE}/integration_base:$(sha256sum commits.txt | cut -d " " -f 1) >> versions.env diff --git a/Docker/Dockerfile-base b/Docker/Dockerfile-base index 2cba531f2fac8e70577e5119937fc8ab7da3b60d..2525d0ca5719860ffbd169c103395ae1c539ad45 100644 --- a/Docker/Dockerfile-base +++ b/Docker/Dockerfile-base @@ -115,7 +115,7 @@ ARG DP3_COMMIT=master RUN git clone --no-checkout \ https://git.astron.nl/RD/DP3.git && \ mkdir DP3/build && \ - cd DP3 && git checkout b493728441362eb15e5ee7dd1bd824c97844d700 && \ + cd DP3 && git checkout ${DP3_COMMIT} && \ cd build && \ cmake .. -DPORTABLE=${PORTABLE} -DLIBDIRAC_PREFIX=/usr/local/ && \ make install -j`nproc`