diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e2eae7725b851f00cfa283e242e43fc6e2e45ccc..e8872983750adaef218986cb9b5f8eb48247c429 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,7 +20,8 @@ # along with this program. If not, see <https://www.gnu.org/licenses/>. variables: - CI_REGISTRY_IMAGE: $CI_REGISTRY/caosdb/src/caosdb-cpplib/testenv:latest + CI_REGISTRY_IMAGE_CPPLIB: $CI_REGISTRY/caosdb/src/caosdb-cpplib/testenv:latest + CI_REGISTRY_IMAGE: $CI_REGISTRY/caosdb/src/caosdb-cppinttest/testenv:latest TRIGGERED_BY_REPO: CPPINTTEST TRIGGERED_BY_REF: $CI_COMMIT_REF_NAME TRIGGERED_BY_HASH: $CI_COMMIT_SHORT_SHA @@ -39,9 +40,9 @@ build-testenv: script: - echo "Pipeline triggered by $TRIGGERED_BY_REPO@$TRIGGERED_BY_REF ($TRIGGERED_BY_HASH)" - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - - docker pull $CI_REGISTRY_IMAGE|| true + - docker pull $CI_REGISTRY_IMAGE_CPPLIB|| true - docker build - --build-arg CI_REGISTRY_IMAGE=$CI_REGISTRY_IMAGE + --build-arg CI_REGISTRY_IMAGE=$CI_REGISTRY_IMAGE_CPPLIB --file .docker/Dockerfile --pull --cache-from $CI_REGISTRY_IMAGE