Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 6844c30

Browse files
Merge branch 'fix-ci' into 'master'
fix CI: Remove conflicting docker_vars causing Docker connection issues See merge request postgres-ai/database-lab!1044
2 parents ad6b895 + 552c9f3 commit 6844c30

File tree

2 files changed

+3
-36
lines changed

2 files changed

+3
-36
lines changed

‎engine/.gitlab-ci.yml

Lines changed: 3 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -139,10 +139,6 @@ build-binary-client-rc:
139139
# Upload artifacts.
140140
- gsutil -m cp -r bin/cli/* gs://database-lab-cli/${CLEAN_TAG}/
141141

142-
.docker_vars: &docker_vars
143-
DOCKER_HOST: tcp://docker:2375
144-
DOCKER_TLS_CERTDIR: ""
145-
146142
.job_template: &build_image_definition
147143
image:
148144
name: docker:24
@@ -165,7 +161,6 @@ build-image-feature-server:
165161
<<: *build_image_definition
166162
<<: *only_feature
167163
variables:
168-
<<: *docker_vars
169164
REGISTRY_USER: "${CI_REGISTRY_USER}"
170165
REGISTRY_PASSWORD: "${CI_REGISTRY_PASSWORD}"
171166
REGISTRY: "${CI_REGISTRY}"
@@ -177,7 +172,6 @@ build-image-feature-server-zfs08:
177172
<<: *build_image_definition
178173
<<: *only_feature
179174
variables:
180-
<<: *docker_vars
181175
REGISTRY_USER: "${CI_REGISTRY_USER}"
182176
REGISTRY_PASSWORD: "${CI_REGISTRY_PASSWORD}"
183177
REGISTRY: "${CI_REGISTRY}"
@@ -189,7 +183,6 @@ build-image-feature-ci-checker:
189183
<<: *build_image_definition
190184
<<: *only_feature
191185
variables:
192-
<<: *docker_vars
193186
REGISTRY_USER: "${CI_REGISTRY_USER}"
194187
REGISTRY_PASSWORD: "${CI_REGISTRY_PASSWORD}"
195188
REGISTRY: "${CI_REGISTRY}"
@@ -201,7 +194,6 @@ build-image-feature-client:
201194
<<: *build_image_definition
202195
<<: *only_feature
203196
variables:
204-
<<: *docker_vars
205197
REGISTRY_USER: "${CI_REGISTRY_USER}"
206198
REGISTRY_PASSWORD: "${CI_REGISTRY_PASSWORD}"
207199
REGISTRY: "${CI_REGISTRY}"
@@ -213,16 +205,14 @@ build-image-master-server:
213205
<<: *build_image_definition
214206
<<: *only_master
215207
variables:
216-
<<: *docker_vars
217208
DOCKER_FILE: "Dockerfile.dblab-server"
218209
DOCKER_NAME: "registry.gitlab.com/postgres-ai/database-lab/dblab-server"
219210
TAGS: "${DOCKER_NAME}:master,${DOCKER_NAME}:master-${CI_COMMIT_SHORT_SHA}"
220211

221212
build-image-master-server-zfs08:
222213
<<: *build_image_definition
223214
<<: *only_master
224-
variables:
225-
<<: *docker_vars
215+
variables:
226216
DOCKER_FILE: "Dockerfile.dblab-server-zfs08"
227217
DOCKER_NAME: "registry.gitlab.com/postgres-ai/database-lab/dblab-server"
228218
TAGS: "${DOCKER_NAME}:master-zfs0.8,${DOCKER_NAME}:master-${CI_COMMIT_SHORT_SHA}-zfs0.8"
@@ -231,16 +221,14 @@ build-image-master-ci-checker:
231221
<<: *build_image_definition
232222
<<: *only_master
233223
variables:
234-
<<: *docker_vars
235224
DOCKER_FILE: "Dockerfile.ci-checker"
236225
DOCKER_NAME: "registry.gitlab.com/postgres-ai/database-lab/dblab-ci-checker"
237226
TAGS: "${DOCKER_NAME}:master,${DOCKER_NAME}:master-${CI_COMMIT_SHORT_SHA}"
238227

239228
build-image-master-client:
240229
<<: *build_image_definition
241230
<<: *only_master
242-
variables:
243-
<<: *docker_vars
231+
variables:
244232
DOCKER_FILE: "Dockerfile.dblab-cli"
245233
DOCKER_NAME: "registry.gitlab.com/postgres-ai/database-lab/dblab-cli"
246234
TAGS: "${DOCKER_NAME}:master,${DOCKER_NAME}:master-${CI_COMMIT_SHORT_SHA}"
@@ -249,7 +237,6 @@ build-image-latest-server:
249237
<<: *build_image_definition
250238
<<: *only_tag_release
251239
variables:
252-
<<: *docker_vars
253240
REGISTRY_USER: "${DH_CI_REGISTRY_USER}"
254241
REGISTRY_PASSWORD: "${DH_CI_REGISTRY_PASSWORD}"
255242
REGISTRY: "${DH_CI_REGISTRY}"
@@ -263,7 +250,6 @@ build-image-latest-server-zfs08:
263250
<<: *build_image_definition
264251
<<: *only_tag_release
265252
variables:
266-
<<: *docker_vars
267253
REGISTRY_USER: "${DH_CI_REGISTRY_USER}"
268254
REGISTRY_PASSWORD: "${DH_CI_REGISTRY_PASSWORD}"
269255
REGISTRY: "${DH_CI_REGISTRY}"
@@ -278,7 +264,6 @@ build-image-latest-server-dev:
278264
<<: *build_image_definition
279265
<<: *only_tag_release
280266
variables:
281-
<<: *docker_vars
282267
REGISTRY_USER: "${CI_REGISTRY_USER}"
283268
REGISTRY_PASSWORD: "${CI_REGISTRY_PASSWORD}"
284269
REGISTRY: "${CI_REGISTRY}"
@@ -292,7 +277,6 @@ build-image-latest-ci-checker:
292277
<<: *build_image_definition
293278
<<: *only_tag_release
294279
variables:
295-
<<: *docker_vars
296280
REGISTRY_USER: "${DH_CI_REGISTRY_USER}"
297281
REGISTRY_PASSWORD: "${DH_CI_REGISTRY_PASSWORD}"
298282
REGISTRY: "${DH_CI_REGISTRY}"
@@ -307,7 +291,6 @@ build-image-latest-ci-checker-dev:
307291
<<: *build_image_definition
308292
<<: *only_tag_release
309293
variables:
310-
<<: *docker_vars
311294
REGISTRY_USER: "${CI_REGISTRY_USER}"
312295
REGISTRY_PASSWORD: "${CI_REGISTRY_PASSWORD}"
313296
REGISTRY: "${CI_REGISTRY}"
@@ -321,7 +304,6 @@ build-image-latest-client:
321304
<<: *build_image_definition
322305
<<: *only_tag_release
323306
variables:
324-
<<: *docker_vars
325307
REGISTRY_USER: "${DH_CI_REGISTRY_USER}"
326308
REGISTRY_PASSWORD: "${DH_CI_REGISTRY_PASSWORD}"
327309
REGISTRY: "${DH_CI_REGISTRY}"
@@ -339,7 +321,6 @@ build-image-rc-server:
339321
- export CLEAN_TAG=$(echo ${CI_COMMIT_TAG#"v"})
340322
- export TAGS="${DOCKER_NAME}:${CLEAN_TAG}"
341323
variables:
342-
<<: *docker_vars
343324
REGISTRY_USER: "${DH_CI_REGISTRY_USER}"
344325
REGISTRY_PASSWORD: "${DH_CI_REGISTRY_PASSWORD}"
345326
REGISTRY: "${DH_CI_REGISTRY}"
@@ -353,7 +334,6 @@ build-image-rc-server-zfs08:
353334
- export CLEAN_TAG=$(echo ${CI_COMMIT_TAG#"v"})
354335
- export TAGS="${DOCKER_NAME}:${CLEAN_TAG}-zfs0.8"
355336
variables:
356-
<<: *docker_vars
357337
REGISTRY_USER: "${DH_CI_REGISTRY_USER}"
358338
REGISTRY_PASSWORD: "${DH_CI_REGISTRY_PASSWORD}"
359339
REGISTRY: "${DH_CI_REGISTRY}"
@@ -366,7 +346,6 @@ build-image-rc-server-dev:
366346
- export CLEAN_TAG=$(echo ${CI_COMMIT_TAG#"v"})
367347
- export TAGS="${DOCKER_NAME}:${CLEAN_TAG}"
368348
variables:
369-
<<: *docker_vars
370349
REGISTRY_USER: "${CI_REGISTRY_USER}"
371350
REGISTRY_PASSWORD: "${CI_REGISTRY_PASSWORD}"
372351
REGISTRY: "${CI_REGISTRY}"
@@ -379,7 +358,6 @@ build-image-rc-server-dev-zfs08:
379358
- export CLEAN_TAG=$(echo ${CI_COMMIT_TAG#"v"})
380359
- export TAGS="${DOCKER_NAME}:${CLEAN_TAG}-zfs0.8"
381360
variables:
382-
<<: *docker_vars
383361
REGISTRY_USER: "${CI_REGISTRY_USER}"
384362
REGISTRY_PASSWORD: "${CI_REGISTRY_PASSWORD}"
385363
REGISTRY: "${CI_REGISTRY}"
@@ -392,7 +370,6 @@ build-image-rc-ci-checker:
392370
- export CLEAN_TAG=$(echo ${CI_COMMIT_TAG#"v"})
393371
- export TAGS="${DOCKER_NAME}:${CLEAN_TAG}"
394372
variables:
395-
<<: *docker_vars
396373
REGISTRY_USER: "${DH_CI_REGISTRY_USER}"
397374
REGISTRY_PASSWORD: "${DH_CI_REGISTRY_PASSWORD}"
398375
REGISTRY: "${DH_CI_REGISTRY}"
@@ -405,7 +382,6 @@ build-image-rc-ci-checker-dev:
405382
- export CLEAN_TAG=$(echo ${CI_COMMIT_TAG#"v"})
406383
- export TAGS="${DOCKER_NAME}:${CLEAN_TAG}"
407384
variables:
408-
<<: *docker_vars
409385
REGISTRY_USER: "${CI_REGISTRY_USER}"
410386
REGISTRY_PASSWORD: "${CI_REGISTRY_PASSWORD}"
411387
REGISTRY: "${CI_REGISTRY}"
@@ -418,7 +394,6 @@ build-image-rc-client:
418394
- export CLEAN_TAG=$(echo ${CI_COMMIT_TAG#"v"})
419395
- export TAGS="${DOCKER_NAME}:${CLEAN_TAG}"
420396
variables:
421-
<<: *docker_vars
422397
REGISTRY_USER: "${DH_CI_REGISTRY_USER}"
423398
REGISTRY_PASSWORD: "${DH_CI_REGISTRY_PASSWORD}"
424399
REGISTRY: "${DH_CI_REGISTRY}"
@@ -428,7 +403,6 @@ build-image-swagger-release:
428403
<<: *build_image_definition
429404
<<: *only_tag_release
430405
variables:
431-
<<: *docker_vars
432406
DOCKER_FILE: "Dockerfile.swagger-ui"
433407
DOCKER_IMAGE_NAME: "registry.gitlab.com/postgres-ai/database-lab/dblab-swagger-ui"
434408
before_script:
@@ -514,7 +488,7 @@ integration-test:
514488
stage: integration-test
515489
variables:
516490
# Instruct Testcontainers to use the daemon of DinD.
517-
DOCKER_HOST: "tcp://docker:2375"
491+
#DOCKER_HOST: "tcp://docker:2375"
518492
# Instruct Docker not to start over TLS.
519493
DOCKER_TLS_CERTDIR: ""
520494
# Improve performance with overlayfs.

‎ui/packages/ce/.gitlab-ci.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@
1111
rules:
1212
- if: $CI_COMMIT_TAG =~ /^v[a-zA-Z0-9_.-]*/
1313

14-
.docker_vars: &docker_vars
15-
DOCKER_HOST: tcp://docker:2375
16-
DOCKER_TLS_CERTDIR: ""
17-
1814
.ui_cache: &ui_cache
1915
image:
2016
name: node:lts-alpine
@@ -49,7 +45,6 @@ ui_build_ce_image_release:
4945
<<: *build_definition
5046
<<: *only_ui_tag_release
5147
variables:
52-
<<: *docker_vars
5348
REGISTRY_USER: "${DH_CI_REGISTRY_USER}"
5449
REGISTRY_PASSWORD: "${DH_CI_REGISTRY_PASSWORD}"
5550
REGISTRY: "${DH_CI_REGISTRY}"
@@ -62,7 +57,6 @@ ui_build_ce_image_master:
6257
<<: *build_definition
6358
<<: *only_ui_master
6459
variables:
65-
<<: *docker_vars
6660
REGISTRY_USER: "${CI_REGISTRY_USER}"
6761
REGISTRY_PASSWORD: "${CI_REGISTRY_PASSWORD}"
6862
REGISTRY: "${CI_REGISTRY}"
@@ -73,7 +67,6 @@ ui_build_ce_image_dev:
7367
<<: *build_definition
7468
<<: *only_ui_feature
7569
variables:
76-
<<: *docker_vars
7770
REGISTRY_USER: "${CI_REGISTRY_USER}"
7871
REGISTRY_PASSWORD: "${CI_REGISTRY_PASSWORD}"
7972
REGISTRY: "${CI_REGISTRY}"

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /