@@ -139,10 +139,6 @@ build-binary-client-rc:
139
139
# Upload artifacts.
140
140
- gsutil -m cp -r bin/cli/* gs://database-lab-cli/${CLEAN_TAG}/
141
141
142
- .docker_vars : &docker_vars
143
- DOCKER_HOST : tcp://docker:2375
144
- DOCKER_TLS_CERTDIR : " "
145
-
146
142
.job_template : &build_image_definition
147
143
image :
148
144
name : docker:24
@@ -165,7 +161,6 @@ build-image-feature-server:
165
161
<< : *build_image_definition
166
162
<< : *only_feature
167
163
variables :
168
- << : *docker_vars
169
164
REGISTRY_USER : " ${CI_REGISTRY_USER}"
170
165
REGISTRY_PASSWORD : " ${CI_REGISTRY_PASSWORD}"
171
166
REGISTRY : " ${CI_REGISTRY}"
@@ -177,7 +172,6 @@ build-image-feature-server-zfs08:
177
172
<< : *build_image_definition
178
173
<< : *only_feature
179
174
variables :
180
- << : *docker_vars
181
175
REGISTRY_USER : " ${CI_REGISTRY_USER}"
182
176
REGISTRY_PASSWORD : " ${CI_REGISTRY_PASSWORD}"
183
177
REGISTRY : " ${CI_REGISTRY}"
@@ -189,7 +183,6 @@ build-image-feature-ci-checker:
189
183
<< : *build_image_definition
190
184
<< : *only_feature
191
185
variables :
192
- << : *docker_vars
193
186
REGISTRY_USER : " ${CI_REGISTRY_USER}"
194
187
REGISTRY_PASSWORD : " ${CI_REGISTRY_PASSWORD}"
195
188
REGISTRY : " ${CI_REGISTRY}"
@@ -201,7 +194,6 @@ build-image-feature-client:
201
194
<< : *build_image_definition
202
195
<< : *only_feature
203
196
variables :
204
- << : *docker_vars
205
197
REGISTRY_USER : " ${CI_REGISTRY_USER}"
206
198
REGISTRY_PASSWORD : " ${CI_REGISTRY_PASSWORD}"
207
199
REGISTRY : " ${CI_REGISTRY}"
@@ -213,16 +205,14 @@ build-image-master-server:
213
205
<< : *build_image_definition
214
206
<< : *only_master
215
207
variables :
216
- << : *docker_vars
217
208
DOCKER_FILE : " Dockerfile.dblab-server"
218
209
DOCKER_NAME : " registry.gitlab.com/postgres-ai/database-lab/dblab-server"
219
210
TAGS : " ${DOCKER_NAME}:master,${DOCKER_NAME}:master-${CI_COMMIT_SHORT_SHA}"
220
211
221
212
build-image-master-server-zfs08 :
222
213
<< : *build_image_definition
223
214
<< : *only_master
224
- variables :
225
- << : *docker_vars
215
+ variables :
226
216
DOCKER_FILE : " Dockerfile.dblab-server-zfs08"
227
217
DOCKER_NAME : " registry.gitlab.com/postgres-ai/database-lab/dblab-server"
228
218
TAGS : " ${DOCKER_NAME}:master-zfs0.8,${DOCKER_NAME}:master-${CI_COMMIT_SHORT_SHA}-zfs0.8"
@@ -231,16 +221,14 @@ build-image-master-ci-checker:
231
221
<< : *build_image_definition
232
222
<< : *only_master
233
223
variables :
234
- << : *docker_vars
235
224
DOCKER_FILE : " Dockerfile.ci-checker"
236
225
DOCKER_NAME : " registry.gitlab.com/postgres-ai/database-lab/dblab-ci-checker"
237
226
TAGS : " ${DOCKER_NAME}:master,${DOCKER_NAME}:master-${CI_COMMIT_SHORT_SHA}"
238
227
239
228
build-image-master-client :
240
229
<< : *build_image_definition
241
230
<< : *only_master
242
- variables :
243
- << : *docker_vars
231
+ variables :
244
232
DOCKER_FILE : " Dockerfile.dblab-cli"
245
233
DOCKER_NAME : " registry.gitlab.com/postgres-ai/database-lab/dblab-cli"
246
234
TAGS : " ${DOCKER_NAME}:master,${DOCKER_NAME}:master-${CI_COMMIT_SHORT_SHA}"
@@ -249,7 +237,6 @@ build-image-latest-server:
249
237
<< : *build_image_definition
250
238
<< : *only_tag_release
251
239
variables :
252
- << : *docker_vars
253
240
REGISTRY_USER : " ${DH_CI_REGISTRY_USER}"
254
241
REGISTRY_PASSWORD : " ${DH_CI_REGISTRY_PASSWORD}"
255
242
REGISTRY : " ${DH_CI_REGISTRY}"
@@ -263,7 +250,6 @@ build-image-latest-server-zfs08:
263
250
<< : *build_image_definition
264
251
<< : *only_tag_release
265
252
variables :
266
- << : *docker_vars
267
253
REGISTRY_USER : " ${DH_CI_REGISTRY_USER}"
268
254
REGISTRY_PASSWORD : " ${DH_CI_REGISTRY_PASSWORD}"
269
255
REGISTRY : " ${DH_CI_REGISTRY}"
@@ -278,7 +264,6 @@ build-image-latest-server-dev:
278
264
<< : *build_image_definition
279
265
<< : *only_tag_release
280
266
variables :
281
- << : *docker_vars
282
267
REGISTRY_USER : " ${CI_REGISTRY_USER}"
283
268
REGISTRY_PASSWORD : " ${CI_REGISTRY_PASSWORD}"
284
269
REGISTRY : " ${CI_REGISTRY}"
@@ -292,7 +277,6 @@ build-image-latest-ci-checker:
292
277
<< : *build_image_definition
293
278
<< : *only_tag_release
294
279
variables :
295
- << : *docker_vars
296
280
REGISTRY_USER : " ${DH_CI_REGISTRY_USER}"
297
281
REGISTRY_PASSWORD : " ${DH_CI_REGISTRY_PASSWORD}"
298
282
REGISTRY : " ${DH_CI_REGISTRY}"
@@ -307,7 +291,6 @@ build-image-latest-ci-checker-dev:
307
291
<< : *build_image_definition
308
292
<< : *only_tag_release
309
293
variables :
310
- << : *docker_vars
311
294
REGISTRY_USER : " ${CI_REGISTRY_USER}"
312
295
REGISTRY_PASSWORD : " ${CI_REGISTRY_PASSWORD}"
313
296
REGISTRY : " ${CI_REGISTRY}"
@@ -321,7 +304,6 @@ build-image-latest-client:
321
304
<< : *build_image_definition
322
305
<< : *only_tag_release
323
306
variables :
324
- << : *docker_vars
325
307
REGISTRY_USER : " ${DH_CI_REGISTRY_USER}"
326
308
REGISTRY_PASSWORD : " ${DH_CI_REGISTRY_PASSWORD}"
327
309
REGISTRY : " ${DH_CI_REGISTRY}"
@@ -339,7 +321,6 @@ build-image-rc-server:
339
321
- export CLEAN_TAG=$(echo ${CI_COMMIT_TAG#"v"})
340
322
- export TAGS="${DOCKER_NAME}:${CLEAN_TAG}"
341
323
variables :
342
- << : *docker_vars
343
324
REGISTRY_USER : " ${DH_CI_REGISTRY_USER}"
344
325
REGISTRY_PASSWORD : " ${DH_CI_REGISTRY_PASSWORD}"
345
326
REGISTRY : " ${DH_CI_REGISTRY}"
@@ -353,7 +334,6 @@ build-image-rc-server-zfs08:
353
334
- export CLEAN_TAG=$(echo ${CI_COMMIT_TAG#"v"})
354
335
- export TAGS="${DOCKER_NAME}:${CLEAN_TAG}-zfs0.8"
355
336
variables :
356
- << : *docker_vars
357
337
REGISTRY_USER : " ${DH_CI_REGISTRY_USER}"
358
338
REGISTRY_PASSWORD : " ${DH_CI_REGISTRY_PASSWORD}"
359
339
REGISTRY : " ${DH_CI_REGISTRY}"
@@ -366,7 +346,6 @@ build-image-rc-server-dev:
366
346
- export CLEAN_TAG=$(echo ${CI_COMMIT_TAG#"v"})
367
347
- export TAGS="${DOCKER_NAME}:${CLEAN_TAG}"
368
348
variables :
369
- << : *docker_vars
370
349
REGISTRY_USER : " ${CI_REGISTRY_USER}"
371
350
REGISTRY_PASSWORD : " ${CI_REGISTRY_PASSWORD}"
372
351
REGISTRY : " ${CI_REGISTRY}"
@@ -379,7 +358,6 @@ build-image-rc-server-dev-zfs08:
379
358
- export CLEAN_TAG=$(echo ${CI_COMMIT_TAG#"v"})
380
359
- export TAGS="${DOCKER_NAME}:${CLEAN_TAG}-zfs0.8"
381
360
variables :
382
- << : *docker_vars
383
361
REGISTRY_USER : " ${CI_REGISTRY_USER}"
384
362
REGISTRY_PASSWORD : " ${CI_REGISTRY_PASSWORD}"
385
363
REGISTRY : " ${CI_REGISTRY}"
@@ -392,7 +370,6 @@ build-image-rc-ci-checker:
392
370
- export CLEAN_TAG=$(echo ${CI_COMMIT_TAG#"v"})
393
371
- export TAGS="${DOCKER_NAME}:${CLEAN_TAG}"
394
372
variables :
395
- << : *docker_vars
396
373
REGISTRY_USER : " ${DH_CI_REGISTRY_USER}"
397
374
REGISTRY_PASSWORD : " ${DH_CI_REGISTRY_PASSWORD}"
398
375
REGISTRY : " ${DH_CI_REGISTRY}"
@@ -405,7 +382,6 @@ build-image-rc-ci-checker-dev:
405
382
- export CLEAN_TAG=$(echo ${CI_COMMIT_TAG#"v"})
406
383
- export TAGS="${DOCKER_NAME}:${CLEAN_TAG}"
407
384
variables :
408
- << : *docker_vars
409
385
REGISTRY_USER : " ${CI_REGISTRY_USER}"
410
386
REGISTRY_PASSWORD : " ${CI_REGISTRY_PASSWORD}"
411
387
REGISTRY : " ${CI_REGISTRY}"
@@ -418,7 +394,6 @@ build-image-rc-client:
418
394
- export CLEAN_TAG=$(echo ${CI_COMMIT_TAG#"v"})
419
395
- export TAGS="${DOCKER_NAME}:${CLEAN_TAG}"
420
396
variables :
421
- << : *docker_vars
422
397
REGISTRY_USER : " ${DH_CI_REGISTRY_USER}"
423
398
REGISTRY_PASSWORD : " ${DH_CI_REGISTRY_PASSWORD}"
424
399
REGISTRY : " ${DH_CI_REGISTRY}"
@@ -428,7 +403,6 @@ build-image-swagger-release:
428
403
<< : *build_image_definition
429
404
<< : *only_tag_release
430
405
variables :
431
- << : *docker_vars
432
406
DOCKER_FILE : " Dockerfile.swagger-ui"
433
407
DOCKER_IMAGE_NAME : " registry.gitlab.com/postgres-ai/database-lab/dblab-swagger-ui"
434
408
before_script :
@@ -514,7 +488,7 @@ integration-test:
514
488
stage : integration-test
515
489
variables :
516
490
# Instruct Testcontainers to use the daemon of DinD.
517
- DOCKER_HOST : " tcp://docker:2375"
491
+ # DOCKER_HOST: "tcp://docker:2375"
518
492
# Instruct Docker not to start over TLS.
519
493
DOCKER_TLS_CERTDIR : " "
520
494
# Improve performance with overlayfs.
0 commit comments