@@ -86,6 +86,8 @@ build-binary-client-master:
86
86
build-binary-client :
87
87
<< : *only_tag_release
88
88
stage : build-binary
89
+ before_script :
90
+ - export CLEAN_TAG=$(echo ${CI_COMMIT_TAG#"v"})
89
91
script :
90
92
- make build-client
91
93
@@ -98,12 +100,14 @@ build-binary-client:
98
100
- echo $GCP_SERVICE_KEY | gcloud auth activate-service-account --key-file=-
99
101
100
102
# 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 }/
102
104
- gsutil -m cp -r bin/cli/* gs://database-lab-cli/latest/
103
105
104
106
build-binary-client-rc :
105
107
<< : *only_tag_rc
106
108
stage : build-binary
109
+ before_script :
110
+ - export CLEAN_TAG=$(echo ${CI_COMMIT_TAG#"v"})
107
111
script :
108
112
- make build-client
109
113
@@ -116,7 +120,7 @@ build-binary-client-rc:
116
120
- echo $GCP_SERVICE_KEY | gcloud auth activate-service-account --key-file=-
117
121
118
122
# 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 }/
120
124
121
125
.job_template : &build_image_definition
122
126
image : docker:19
@@ -258,57 +262,67 @@ build-image-latest-client:
258
262
build-image-rc-server :
259
263
<< : *build_image_definition
260
264
<< : *only_tag_rc
265
+ before_script :
266
+ - export CLEAN_TAG=$(echo ${CI_COMMIT_TAG#"v"})
261
267
variables :
262
268
REGISTRY_USER : " ${DH_CI_REGISTRY_USER}"
263
269
REGISTRY_PASSWORD : " ${DH_CI_REGISTRY_PASSWORD}"
264
270
REGISTRY : " ${DH_CI_REGISTRY}"
265
271
DOCKER_FILE : " Dockerfile.dblab-server"
266
272
DOCKER_NAME : " postgresai/dblab-server"
267
- TAGS : " ${DOCKER_NAME}:${CI_COMMIT_TAG }"
273
+ TAGS : " ${DOCKER_NAME}:${CLEAN_TAG }"
268
274
269
275
build-image-rc-server-dev :
270
276
<< : *build_image_definition
271
277
<< : *only_tag_rc
278
+ before_script :
279
+ - export CLEAN_TAG=$(echo ${CI_COMMIT_TAG#"v"})
272
280
variables :
273
281
REGISTRY_USER : " ${CI_REGISTRY_USER}"
274
282
REGISTRY_PASSWORD : " ${CI_REGISTRY_PASSWORD}"
275
283
REGISTRY : " ${CI_REGISTRY}"
276
284
DOCKER_FILE : " Dockerfile.dblab-server"
277
285
DOCKER_NAME : " registry.gitlab.com/postgres-ai/database-lab/dblab-server"
278
- TAGS : " ${DOCKER_NAME}:${CI_COMMIT_TAG }"
286
+ TAGS : " ${DOCKER_NAME}:${CLEAN_TAG }"
279
287
280
288
build-image-rc-ci-checker :
281
289
<< : *build_image_definition
282
290
<< : *only_tag_rc
291
+ before_script :
292
+ - export CLEAN_TAG=$(echo ${CI_COMMIT_TAG#"v"})
283
293
variables :
284
294
REGISTRY_USER : " ${DH_CI_REGISTRY_USER}"
285
295
REGISTRY_PASSWORD : " ${DH_CI_REGISTRY_PASSWORD}"
286
296
REGISTRY : " ${DH_CI_REGISTRY}"
287
297
DOCKER_FILE : " Dockerfile.ci-checker"
288
298
DOCKER_NAME : " postgresai/dblab-ci-checker"
289
- TAGS : " ${DOCKER_NAME}:${CI_COMMIT_TAG }"
299
+ TAGS : " ${DOCKER_NAME}:${CLEAN_TAG }"
290
300
291
301
build-image-rc-ci-checker-dev :
292
302
<< : *build_image_definition
293
303
<< : *only_tag_rc
304
+ before_script :
305
+ - export CLEAN_TAG=$(echo ${CI_COMMIT_TAG#"v"})
294
306
variables :
295
307
REGISTRY_USER : " ${CI_REGISTRY_USER}"
296
308
REGISTRY_PASSWORD : " ${CI_REGISTRY_PASSWORD}"
297
309
REGISTRY : " ${CI_REGISTRY}"
298
310
DOCKER_FILE : " Dockerfile.ci-checker"
299
311
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 }"
301
313
302
314
build-image-rc-client :
303
315
<< : *build_image_definition
304
316
<< : *only_tag_rc
317
+ before_script :
318
+ - export CLEAN_TAG=$(echo ${CI_COMMIT_TAG#"v"})
305
319
variables :
306
320
REGISTRY_USER : " ${DH_CI_REGISTRY_USER}"
307
321
REGISTRY_PASSWORD : " ${DH_CI_REGISTRY_PASSWORD}"
308
322
REGISTRY : " ${DH_CI_REGISTRY}"
309
323
DOCKER_FILE : " Dockerfile.dblab-cli"
310
324
DOCKER_NAME : " postgresai/dblab"
311
- TAGS : " ${DOCKER_NAME}:${CI_COMMIT_TAG }"
325
+ TAGS : " ${DOCKER_NAME}:${CLEAN_TAG }"
312
326
313
327
build-image-swagger-latest :
314
328
<< : *build_image_definition
0 commit comments