From 7b9b675dd601542d56c519f84b5a5b314f07a4ea Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Mon, 7 Jun 2021 01:19:43 +0200
Subject: [PATCH] WIP: pipeline
---
.gitlab-ci.yml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f378d23..f8400b5 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
--
GitLab