diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f378d23f0d4a7d4c50448e42ee0f7452339fb86a..f8400b5e993363e0fd0d2efe579dbaf957353a9c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,8 +24,8 @@ variables: CPPLIB_TESTENV_IMAGE_SUFFIX: $CI_COMMIT_REF_NAME CPPLIB_REPO_PATH: caosdb/src/caosdb-cpplib CPPLIB_TESTENV_IMAGE_TAG: ${CPPLIB_REPO_PATH}/testenv:${CPPLIB_IMAGE_SUFFIX} - CPPLIB_REGISTRY_IMAGE: ${CI_REGISTRY}/${CPPLIB_IMAGE_TAG} - CPPLIB_IMAGE_CACHE: ${CPPLIB_IMAGE_TAG}.tar + CPPLIB_REGISTRY_IMAGE: ${CI_REGISTRY}/${CPPLIB_TESTENV_IMAGE_TAG} + CPPLIB_IMAGE_CACHE: ${CPPLIB_TESTENV_IMAGE_TAG}.tar CPPINTTEST_REPO: https://gitlab.indiscale.com/api/v4/projects/111 CPPINTTEST_PIPELINE: $CPPINTTEST_REPO/trigger/pipeline @@ -65,10 +65,10 @@ build-testenv: # use here general latest or specific branch latest... - docker pull $CPPLIB_REGISTRY_IMAGE|| true - docker build - -f .docker/Dockerfile + --file .docker/Dockerfile --pull --cache-from $CPPLIB_REGISTRY_IMAGE - -t $CPPLIB_REGISTRY_IMAGE . + --tag $CPPLIB_REGISTRY_IMAGE . - docker push $CPPLIB_REGISTRY_IMAGE # formatting with clang-format