Skip to content

Commit 3b5e5a6

Browse files
committed
Merge branch 'logical-docker-images' into 'master'
fix: build DLMC images and update default Docker images for logical case (#240): * build DLMC images * update default Docker images for logical case See merge request postgres-ai/database-lab!304
2 parents d3ccd39 + 6cce8d6 commit 3b5e5a6

File tree

3 files changed

+36
-4
lines changed

3 files changed

+36
-4
lines changed

.gitlab-ci.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,14 @@ build-image-master-server:
167167
DOCKER_NAME: "registry.gitlab.com/postgres-ai/database-lab/dblab-server"
168168
TAGS: "${DOCKER_NAME}:master,${DOCKER_NAME}:master-${CI_COMMIT_SHORT_SHA}"
169169

170+
build-image-master-ci-checker:
171+
<<: *build_image_definition
172+
<<: *only_master
173+
variables:
174+
DOCKER_FILE: "Dockerfile.ci-checker"
175+
DOCKER_NAME: "registry.gitlab.com/postgres-ai/database-lab/dblab-ci-checker"
176+
TAGS: "${DOCKER_NAME}:master,${DOCKER_NAME}:master-${CI_COMMIT_SHORT_SHA}"
177+
170178
build-image-master-client:
171179
<<: *build_image_definition
172180
<<: *only_master
@@ -188,6 +196,19 @@ build-image-latest-server:
188196
- export LATEST_TAG=$(echo ${CI_COMMIT_TAG%.*}-latest)
189197
- export TAGS="${DOCKER_NAME}:${LATEST_TAG},${DOCKER_NAME}:${CI_COMMIT_TAG}"
190198

199+
build-image-latest-ci-checker:
200+
<<: *build_image_definition
201+
<<: *only_tag_release
202+
variables:
203+
REGISTRY_USER: "${DH_CI_REGISTRY_USER}"
204+
REGISTRY_PASSWORD: "${DH_CI_REGISTRY_PASSWORD}"
205+
REGISTRY: "${DH_CI_REGISTRY}"
206+
DOCKER_FILE: "Dockerfile.ci-checker"
207+
DOCKER_NAME: "postgresai/dblab-ci-checker"
208+
before_script:
209+
- export LATEST_TAG=$(echo ${CI_COMMIT_TAG%.*}-latest)
210+
- export TAGS="${DOCKER_NAME}:${LATEST_TAG},${DOCKER_NAME}:${CI_COMMIT_TAG}"
211+
191212
build-image-latest-client:
192213
<<: *build_image_definition
193214
<<: *only_tag_release
@@ -212,6 +233,17 @@ build-image-rc-server:
212233
DOCKER_NAME: "postgresai/dblab-server"
213234
TAGS: "${DOCKER_NAME}:${CI_COMMIT_TAG}"
214235

236+
build-image-rc-ci-checker:
237+
<<: *build_image_definition
238+
<<: *only_tag_rc
239+
variables:
240+
REGISTRY_USER: "${DH_CI_REGISTRY_USER}"
241+
REGISTRY_PASSWORD: "${DH_CI_REGISTRY_PASSWORD}"
242+
REGISTRY: "${DH_CI_REGISTRY}"
243+
DOCKER_FILE: "Dockerfile.ci-checker"
244+
DOCKER_NAME: "postgresai/dblab-ci-checker"
245+
TAGS: "${DOCKER_NAME}:${CI_COMMIT_TAG}"
246+
215247
build-image-rc-client:
216248
<<: *build_image_definition
217249
<<: *only_tag_rc

configs/config.example.logical_generic.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ retrieval:
151151
dumpLocation: "/var/lib/dblab/dblab_pool/dump/db.dump"
152152

153153
# The Docker image containing the tools required to get a dump.
154-
dockerImage: "postgres:13-alpine"
154+
dockerImage: "postgresai/extended-postgres:13"
155155

156156
# Source of data.
157157
source:
@@ -204,7 +204,7 @@ retrieval:
204204
dumpLocation: "/var/lib/dblab/dblab_pool/dump/db.dump"
205205

206206
# The Docker image containing the tools required to restore.
207-
dockerImage: "postgres:13-alpine"
207+
dockerImage: "postgresai/extended-postgres:13"
208208

209209
# Use parallel jobs to restore faster.
210210
parallelJobs: 2

configs/config.example.logical_rds_iam.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ retrieval:
150150
dumpLocation: "/var/lib/dblab/dblab_pool/dump/rds_db.dump"
151151

152152
# The Docker image containing the tools required to get a dump.
153-
dockerImage: "postgres:13-alpine"
153+
dockerImage: "postgresai/extended-postgres:13"
154154

155155
# Source of data.
156156
source:
@@ -205,7 +205,7 @@ retrieval:
205205
dumpLocation: "/var/lib/dblab/dblab_pool/dump/rds_db.dump"
206206

207207
# The Docker image containing the tools required to restore.
208-
dockerImage: "postgres:13-alpine"
208+
dockerImage: "postgresai/extended-postgres:13"
209209

210210
# Use parallel jobs to restore faster.
211211
parallelJobs: 2

0 commit comments

Comments
 (0)