@@ -86,6 +86,8 @@ build-binary-client-master:
8686build-binary-client :
8787 << : *only_tag_release
8888 stage : build-binary
89+ before_script :
90+ - export CLEAN_TAG=$(echo ${CI_COMMIT_TAG#"v"})
8991 script :
9092 - make build-client
9193
@@ -98,12 +100,14 @@ build-binary-client:
98100 - echo $GCP_SERVICE_KEY | gcloud auth activate-service-account --key-file=-
99101
100102 # Upload artifacts.
101- - gsutil -m cp -r bin/cli/* gs://database-lab-cli/${CI_COMMIT_TAG }/
103+ - gsutil -m cp -r bin/cli/* gs://database-lab-cli/${CLEAN_TAG }/
102104 - gsutil -m cp -r bin/cli/* gs://database-lab-cli/latest/
103105
104106build-binary-client-rc :
105107 << : *only_tag_rc
106108 stage : build-binary
109+ before_script :
110+ - export CLEAN_TAG=$(echo ${CI_COMMIT_TAG#"v"})
107111 script :
108112 - make build-client
109113
@@ -116,7 +120,7 @@ build-binary-client-rc:
116120 - echo $GCP_SERVICE_KEY | gcloud auth activate-service-account --key-file=-
117121
118122 # Upload artifacts.
119- - gsutil -m cp -r bin/cli/* gs://database-lab-cli/${CI_COMMIT_TAG }/
123+ - gsutil -m cp -r bin/cli/* gs://database-lab-cli/${CLEAN_TAG }/
120124
121125.job_template : &build_image_definition
122126 image : docker:19
@@ -258,57 +262,67 @@ build-image-latest-client:
258262build-image-rc-server :
259263 << : *build_image_definition
260264 << : *only_tag_rc
265+ before_script :
266+ - export CLEAN_TAG=$(echo ${CI_COMMIT_TAG#"v"})
261267 variables :
262268 REGISTRY_USER : " ${DH_CI_REGISTRY_USER}"
263269 REGISTRY_PASSWORD : " ${DH_CI_REGISTRY_PASSWORD}"
264270 REGISTRY : " ${DH_CI_REGISTRY}"
265271 DOCKER_FILE : " Dockerfile.dblab-server"
266272 DOCKER_NAME : " postgresai/dblab-server"
267- TAGS : " ${DOCKER_NAME}:${CI_COMMIT_TAG }"
273+ TAGS : " ${DOCKER_NAME}:${CLEAN_TAG }"
268274
269275build-image-rc-server-dev :
270276 << : *build_image_definition
271277 << : *only_tag_rc
278+ before_script :
279+ - export CLEAN_TAG=$(echo ${CI_COMMIT_TAG#"v"})
272280 variables :
273281 REGISTRY_USER : " ${CI_REGISTRY_USER}"
274282 REGISTRY_PASSWORD : " ${CI_REGISTRY_PASSWORD}"
275283 REGISTRY : " ${CI_REGISTRY}"
276284 DOCKER_FILE : " Dockerfile.dblab-server"
277285 DOCKER_NAME : " registry.gitlab.com/postgres-ai/database-lab/dblab-server"
278- TAGS : " ${DOCKER_NAME}:${CI_COMMIT_TAG }"
286+ TAGS : " ${DOCKER_NAME}:${CLEAN_TAG }"
279287
280288build-image-rc-ci-checker :
281289 << : *build_image_definition
282290 << : *only_tag_rc
291+ before_script :
292+ - export CLEAN_TAG=$(echo ${CI_COMMIT_TAG#"v"})
283293 variables :
284294 REGISTRY_USER : " ${DH_CI_REGISTRY_USER}"
285295 REGISTRY_PASSWORD : " ${DH_CI_REGISTRY_PASSWORD}"
286296 REGISTRY : " ${DH_CI_REGISTRY}"
287297 DOCKER_FILE : " Dockerfile.ci-checker"
288298 DOCKER_NAME : " postgresai/dblab-ci-checker"
289- TAGS : " ${DOCKER_NAME}:${CI_COMMIT_TAG }"
299+ TAGS : " ${DOCKER_NAME}:${CLEAN_TAG }"
290300
291301build-image-rc-ci-checker-dev :
292302 << : *build_image_definition
293303 << : *only_tag_rc
304+ before_script :
305+ - export CLEAN_TAG=$(echo ${CI_COMMIT_TAG#"v"})
294306 variables :
295307 REGISTRY_USER : " ${CI_REGISTRY_USER}"
296308 REGISTRY_PASSWORD : " ${CI_REGISTRY_PASSWORD}"
297309 REGISTRY : " ${CI_REGISTRY}"
298310 DOCKER_FILE : " Dockerfile.ci-checker"
299311 DOCKER_NAME : " registry.gitlab.com/postgres-ai/database-lab/dblab-ci-checker"
300- TAGS : " ${DOCKER_NAME}:${CI_COMMIT_TAG }"
312+ TAGS : " ${DOCKER_NAME}:${CLEAN_TAG }"
301313
302314build-image-rc-client :
303315 << : *build_image_definition
304316 << : *only_tag_rc
317+ before_script :
318+ - export CLEAN_TAG=$(echo ${CI_COMMIT_TAG#"v"})
305319 variables :
306320 REGISTRY_USER : " ${DH_CI_REGISTRY_USER}"
307321 REGISTRY_PASSWORD : " ${DH_CI_REGISTRY_PASSWORD}"
308322 REGISTRY : " ${DH_CI_REGISTRY}"
309323 DOCKER_FILE : " Dockerfile.dblab-cli"
310324 DOCKER_NAME : " postgresai/dblab"
311- TAGS : " ${DOCKER_NAME}:${CI_COMMIT_TAG }"
325+ TAGS : " ${DOCKER_NAME}:${CLEAN_TAG }"
312326
313327build-image-swagger-latest :
314328 << : *build_image_definition
0 commit comments