Skip to content

Commit 960c764

Browse files
committed
Merge branch 'build-rc-images' into 'master'
fix(engine): explicitly pass RC-tags to the building script to build RC images See merge request postgres-ai/database-lab!495
2 parents 2a86e66 + 91a8d72 commit 960c764

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

Diff for: engine/.gitlab-ci.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -278,65 +278,65 @@ build-image-rc-server:
278278
<<: *only_tag_rc
279279
before_script:
280280
- export CLEAN_TAG=$(echo ${CI_COMMIT_TAG#"v"})
281+
- export TAGS="${DOCKER_NAME}:${CLEAN_TAG}"
281282
variables:
282283
REGISTRY_USER: "${DH_CI_REGISTRY_USER}"
283284
REGISTRY_PASSWORD: "${DH_CI_REGISTRY_PASSWORD}"
284285
REGISTRY: "${DH_CI_REGISTRY}"
285286
DOCKER_FILE: "Dockerfile.dblab-server"
286287
DOCKER_NAME: "postgresai/dblab-server"
287-
TAGS: "${DOCKER_NAME}:${CLEAN_TAG}"
288288

289289
build-image-rc-server-dev:
290290
<<: *build_image_definition
291291
<<: *only_tag_rc
292292
before_script:
293293
- export CLEAN_TAG=$(echo ${CI_COMMIT_TAG#"v"})
294+
- export TAGS="${DOCKER_NAME}:${CLEAN_TAG}"
294295
variables:
295296
REGISTRY_USER: "${CI_REGISTRY_USER}"
296297
REGISTRY_PASSWORD: "${CI_REGISTRY_PASSWORD}"
297298
REGISTRY: "${CI_REGISTRY}"
298299
DOCKER_FILE: "Dockerfile.dblab-server"
299300
DOCKER_NAME: "registry.gitlab.com/postgres-ai/database-lab/dblab-server"
300-
TAGS: "${DOCKER_NAME}:${CLEAN_TAG}"
301301

302302
build-image-rc-ci-checker:
303303
<<: *build_image_definition
304304
<<: *only_tag_rc
305305
before_script:
306306
- export CLEAN_TAG=$(echo ${CI_COMMIT_TAG#"v"})
307+
- export TAGS="${DOCKER_NAME}:${CLEAN_TAG}"
307308
variables:
308309
REGISTRY_USER: "${DH_CI_REGISTRY_USER}"
309310
REGISTRY_PASSWORD: "${DH_CI_REGISTRY_PASSWORD}"
310311
REGISTRY: "${DH_CI_REGISTRY}"
311312
DOCKER_FILE: "Dockerfile.ci-checker"
312313
DOCKER_NAME: "postgresai/dblab-ci-checker"
313-
TAGS: "${DOCKER_NAME}:${CLEAN_TAG}"
314314

315315
build-image-rc-ci-checker-dev:
316316
<<: *build_image_definition
317317
<<: *only_tag_rc
318318
before_script:
319319
- export CLEAN_TAG=$(echo ${CI_COMMIT_TAG#"v"})
320+
- export TAGS="${DOCKER_NAME}:${CLEAN_TAG}"
320321
variables:
321322
REGISTRY_USER: "${CI_REGISTRY_USER}"
322323
REGISTRY_PASSWORD: "${CI_REGISTRY_PASSWORD}"
323324
REGISTRY: "${CI_REGISTRY}"
324325
DOCKER_FILE: "Dockerfile.ci-checker"
325326
DOCKER_NAME: "registry.gitlab.com/postgres-ai/database-lab/dblab-ci-checker"
326-
TAGS: "${DOCKER_NAME}:${CLEAN_TAG}"
327327

328328
build-image-rc-client:
329329
<<: *build_image_definition
330330
<<: *only_tag_rc
331331
before_script:
332332
- export CLEAN_TAG=$(echo ${CI_COMMIT_TAG#"v"})
333+
- export TAGS="${DOCKER_NAME}:${CLEAN_TAG}"
333334
variables:
334335
REGISTRY_USER: "${DH_CI_REGISTRY_USER}"
335336
REGISTRY_PASSWORD: "${DH_CI_REGISTRY_PASSWORD}"
336337
REGISTRY: "${DH_CI_REGISTRY}"
337338
DOCKER_FILE: "Dockerfile.dblab-cli"
338339
DOCKER_NAME: "postgresai/dblab"
339-
TAGS: "${DOCKER_NAME}:${CLEAN_TAG}"
340340

341341
build-image-swagger-latest:
342342
<<: *build_image_definition

0 commit comments

Comments
 (0)