@@ -196,8 +196,9 @@ build-image-latest-server:
196196 DOCKER_FILE : " Dockerfile.dblab-server"
197197 DOCKER_NAME : " postgresai/dblab-server"
198198 before_script :
199- - export LATEST_TAG=$(echo ${CI_COMMIT_TAG%.*}-latest)
200- - export TAGS="${DOCKER_NAME}:${LATEST_TAG},${DOCKER_NAME}:${CI_COMMIT_TAG}"
199+ - export CLEAN_TAG=$(echo ${CI_COMMIT_TAG#"v"})
200+ - export LATEST_TAG=$(echo ${CLEAN_TAG%.*}-latest)
201+ - export TAGS="${DOCKER_NAME}:${LATEST_TAG},${DOCKER_NAME}:${CLEAN_TAG}"
201202
202203build-image-latest-server-dev :
203204 << : *build_image_definition
@@ -209,7 +210,8 @@ build-image-latest-server-dev:
209210 DOCKER_FILE : " Dockerfile.dblab-server"
210211 DOCKER_NAME : " registry.gitlab.com/postgres-ai/database-lab/dblab-server"
211212 before_script :
212- - export TAGS="${DOCKER_NAME}:${CI_COMMIT_TAG}"
213+ - export CLEAN_TAG=$(echo ${CI_COMMIT_TAG#"v"})
214+ - export TAGS="${DOCKER_NAME}:${CLEAN_TAG}"
213215
214216build-image-latest-ci-checker :
215217 << : *build_image_definition
@@ -221,8 +223,9 @@ build-image-latest-ci-checker:
221223 DOCKER_FILE : " Dockerfile.ci-checker"
222224 DOCKER_NAME : " postgresai/dblab-ci-checker"
223225 before_script :
224- - export LATEST_TAG=$(echo ${CI_COMMIT_TAG%.*}-latest)
225- - export TAGS="${DOCKER_NAME}:${LATEST_TAG},${DOCKER_NAME}:${CI_COMMIT_TAG}"
226+ - export CLEAN_TAG=$(echo ${CI_COMMIT_TAG#"v"})
227+ - export LATEST_TAG=$(echo ${CLEAN_TAG%.*}-latest)
228+ - export TAGS="${DOCKER_NAME}:${LATEST_TAG},${DOCKER_NAME}:${CLEAN_TAG}"
226229
227230build-image-latest-ci-checker-dev :
228231 << : *build_image_definition
@@ -234,7 +237,8 @@ build-image-latest-ci-checker-dev:
234237 DOCKER_FILE : " Dockerfile.ci-checker"
235238 DOCKER_NAME : " registry.gitlab.com/postgres-ai/database-lab/dblab-ci-checker"
236239 before_script :
237- - export TAGS="${DOCKER_NAME}:${CI_COMMIT_TAG}"
240+ - export CLEAN_TAG=$(echo ${CI_COMMIT_TAG#"v"})
241+ - export TAGS="${DOCKER_NAME}:${CLEAN_TAG}"
238242
239243build-image-latest-client :
240244 << : *build_image_definition
@@ -246,8 +250,9 @@ build-image-latest-client:
246250 DOCKER_FILE : " Dockerfile.dblab"
247251 DOCKER_NAME : " postgresai/dblab"
248252 before_script :
249- - export LATEST_TAG=$(echo ${CI_COMMIT_TAG%.*}-latest)
250- - export TAGS="${DOCKER_NAME}:${LATEST_TAG},${DOCKER_NAME}:${CI_COMMIT_TAG}"
253+ - export CLEAN_TAG=$(echo ${CI_COMMIT_TAG#"v"})
254+ - export LATEST_TAG=$(echo ${CLEAN_TAG%.*}-latest)
255+ - export TAGS="${DOCKER_NAME}:${LATEST_TAG},${DOCKER_NAME}:${CLEAN_TAG}"
251256
252257build-image-rc-server :
253258 << : *build_image_definition
@@ -311,7 +316,8 @@ build-image-swagger-latest:
311316 DOCKER_FILE : " Dockerfile.swagger-ui"
312317 DOCKER_NAME : " registry.gitlab.com/postgres-ai/database-lab/dblab-swagger-ui"
313318 before_script :
314- - export LATEST_TAG=$(echo ${CI_COMMIT_TAG%.*}-latest)
319+ - export CLEAN_TAG=$(echo ${CI_COMMIT_TAG#"v"})
320+ - export LATEST_TAG=$(echo ${CLEAN_TAG%.*}-latest)
315321 - export TAGS="${DOCKER_NAME}:${LATEST_TAG}"
316322
317323bash-test :
0 commit comments