Skip to content

Commit 188e66f

Browse files
committed
Merge branch 'dev-release-images' into 'master'
fix: build release Docker images for different registries in separate jobs See merge request postgres-ai/database-lab!333
2 parents 0eced1c + 1013cab commit 188e66f

File tree

1 file changed

+50
-8
lines changed

1 file changed

+50
-8
lines changed

.gitlab-ci.yml

Lines changed: 50 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -195,10 +195,21 @@ build-image-latest-server:
195195
REGISTRY: "${DH_CI_REGISTRY}"
196196
DOCKER_FILE: "Dockerfile.dblab-server"
197197
DOCKER_NAME: "postgresai/dblab-server"
198-
DOCKER_DEV_NAME: "registry.gitlab.com/postgres-ai/database-lab/dblab-server"
199198
before_script:
200199
- export LATEST_TAG=$(echo ${CI_COMMIT_TAG%.*}-latest)
201-
- export TAGS="${DOCKER_NAME}:${LATEST_TAG},${DOCKER_NAME}:${CI_COMMIT_TAG},${DOCKER_DEV_NAME}:${CI_COMMIT_TAG}"
200+
- export TAGS="${DOCKER_NAME}:${LATEST_TAG},${DOCKER_NAME}:${CI_COMMIT_TAG}"
201+
202+
build-image-latest-server-dev:
203+
<<: *build_image_definition
204+
<<: *only_tag_release
205+
variables:
206+
REGISTRY_USER: "${CI_REGISTRY_USER}"
207+
REGISTRY_PASSWORD: "${CI_REGISTRY_PASSWORD}"
208+
REGISTRY: "${CI_REGISTRY}"
209+
DOCKER_FILE: "Dockerfile.dblab-server"
210+
DOCKER_NAME: "registry.gitlab.com/postgres-ai/database-lab/dblab-server"
211+
before_script:
212+
- export TAGS="${DOCKER_NAME}:${LATEST_TAG},${DOCKER_NAME}:${CI_COMMIT_TAG}"
202213

203214
build-image-latest-ci-checker:
204215
<<: *build_image_definition
@@ -209,10 +220,21 @@ build-image-latest-ci-checker:
209220
REGISTRY: "${DH_CI_REGISTRY}"
210221
DOCKER_FILE: "Dockerfile.ci-checker"
211222
DOCKER_NAME: "postgresai/dblab-ci-checker"
212-
DOCKER_DEV_NAME: "registry.gitlab.com/postgres-ai/database-lab/dblab-ci-checker"
213223
before_script:
214224
- export LATEST_TAG=$(echo ${CI_COMMIT_TAG%.*}-latest)
215-
- export TAGS="${DOCKER_NAME}:${LATEST_TAG},${DOCKER_NAME}:${CI_COMMIT_TAG},${DOCKER_DEV_NAME}:${CI_COMMIT_TAG}"
225+
- export TAGS="${DOCKER_NAME}:${LATEST_TAG},${DOCKER_NAME}:${CI_COMMIT_TAG}"
226+
227+
build-image-latest-ci-checker-dev:
228+
<<: *build_image_definition
229+
<<: *only_tag_release
230+
variables:
231+
REGISTRY_USER: "${CI_REGISTRY_USER}"
232+
REGISTRY_PASSWORD: "${CI_REGISTRY_PASSWORD}"
233+
REGISTRY: "${CI_REGISTRY}"
234+
DOCKER_FILE: "Dockerfile.ci-checker"
235+
DOCKER_NAME: "registry.gitlab.com/postgres-ai/database-lab/dblab-ci-checker"
236+
before_script:
237+
- export TAGS="${DOCKER_NAME}:${CI_COMMIT_TAG}"
216238

217239
build-image-latest-client:
218240
<<: *build_image_definition
@@ -236,8 +258,18 @@ build-image-rc-server:
236258
REGISTRY: "${DH_CI_REGISTRY}"
237259
DOCKER_FILE: "Dockerfile.dblab-server"
238260
DOCKER_NAME: "postgresai/dblab-server"
239-
DOCKER_DEV_NAME: "registry.gitlab.com/postgres-ai/database-lab/dblab-server"
240-
TAGS: "${DOCKER_NAME}:${CI_COMMIT_TAG},${DOCKER_DEV_NAME}:${CI_COMMIT_TAG}"
261+
TAGS: "${DOCKER_NAME}:${CI_COMMIT_TAG}"
262+
263+
build-image-rc-server-dev:
264+
<<: *build_image_definition
265+
<<: *only_tag_rc
266+
variables:
267+
REGISTRY_USER: "${CI_REGISTRY_USER}"
268+
REGISTRY_PASSWORD: "${CI_REGISTRY_PASSWORD}"
269+
REGISTRY: "${CI_REGISTRY}"
270+
DOCKER_FILE: "Dockerfile.dblab-server"
271+
DOCKER_NAME: "registry.gitlab.com/postgres-ai/database-lab/dblab-server"
272+
TAGS: "${DOCKER_NAME}:${CI_COMMIT_TAG}"
241273

242274
build-image-rc-ci-checker:
243275
<<: *build_image_definition
@@ -248,8 +280,18 @@ build-image-rc-ci-checker:
248280
REGISTRY: "${DH_CI_REGISTRY}"
249281
DOCKER_FILE: "Dockerfile.ci-checker"
250282
DOCKER_NAME: "postgresai/dblab-ci-checker"
251-
DOCKER_DEV_NAME: "registry.gitlab.com/postgres-ai/database-lab/dblab-ci-checker"
252-
TAGS: "${DOCKER_NAME}:${CI_COMMIT_TAG},${DOCKER_DEV_NAME}:${CI_COMMIT_TAG}"
283+
TAGS: "${DOCKER_NAME}:${CI_COMMIT_TAG}"
284+
285+
build-image-rc-ci-checker-dev:
286+
<<: *build_image_definition
287+
<<: *only_tag_rc
288+
variables:
289+
REGISTRY_USER: "${CI_REGISTRY_USER}"
290+
REGISTRY_PASSWORD: "${CI_REGISTRY_PASSWORD}"
291+
REGISTRY: "${CI_REGISTRY}"
292+
DOCKER_FILE: "Dockerfile.ci-checker"
293+
DOCKER_NAME: "registry.gitlab.com/postgres-ai/database-lab/dblab-ci-checker"
294+
TAGS: "${DOCKER_NAME}:${CI_COMMIT_TAG}"
253295

254296
build-image-rc-client:
255297
<<: *build_image_definition

0 commit comments

Comments
 (0)