Skip to content

Commit 91bcf0d

Browse files
committed
Merge branch 'neo/drop-zfs08-images' into 'master'
chore(engine): drop ZFS 0.8 build artifacts Closes #710 See merge request postgres-ai/database-lab!1145
2 parents 1cea71d + 09d0ffc commit 91bcf0d

4 files changed

Lines changed: 6 additions & 87 deletions

File tree

SECURITY.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ Some third-party CVEs cannot yet be patched in DBLab Engine for reasons outside
3030
|-----------|--------|-------|
3131
| `github.com/docker/docker` v28.5.2+incompatible (Go module) | [CVE-2026-34040](https://nvd.nist.gov/vuln/detail/CVE-2026-34040) | No v29 tag is published for this module. Upstream has moved to `github.com/moby/moby/v2`, still in beta at the time of writing. Will be resolved once a stable v29 release or the v2 migration is available. |
3232
| `docker:29.x` base-image embedded binaries (`containerd`, `ctr`, `dockerd`, `compose`, `buildx`) | Multiple — see the [Docker Hub `docker` image advisories](https://hub.docker.com/_/docker/tags) and upstream tracker pages for [containerd](https://github.com/containerd/containerd/security/advisories) and [buildx](https://github.com/docker/buildx/security/advisories) | Depends on Docker Inc. rebuilding `docker:29.x` with updated internals. Tracked and refreshed together with each base-image bump; images are pinned by digest so any rebuild lands via an explicit commit. |
33-
| `Dockerfile.dblab-server-zfs08` (ZFS 0.8 legacy variant) | Inherits base-image CVEs from `docker:27.5.1` ([CVE-2025-15558](https://nvd.nist.gov/vuln/detail/CVE-2025-15558) in docker/cli) and Alpine v3.12 package CVEs not covered by `apk upgrade` ([CVE-2026-28390](https://nvd.nist.gov/vuln/detail/CVE-2026-28390) musl, [CVE-2026-40200](https://nvd.nist.gov/vuln/detail/CVE-2026-40200) openssl, [CVE-2026-22184](https://nvd.nist.gov/vuln/detail/CVE-2026-22184) zlib) | The ZFS 0.8 variant is retained for users on legacy ZFS pools. Alpine v3.12 and `docker:27.5.1` are end-of-life, so upgrading the base image would break the ZFS 0.8 compatibility guarantee. A separate track will deprecate or rebuild this variant. |
3433

3534
Operators should subscribe to upstream advisories for the affected components and re-deploy once DBLab Engine images built against patched versions are published.
3635

engine/.gitlab-ci.yml

Lines changed: 3 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -206,17 +206,6 @@ build-image-feature-server:
206206
DOCKER_NAME: "${CI_REGISTRY}/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/dblab-server"
207207
TAGS: "${DOCKER_NAME}:${CI_COMMIT_REF_SLUG}"
208208

209-
build-image-feature-server-zfs08:
210-
<<: *build_image_definition
211-
<<: *only_feature
212-
variables:
213-
REGISTRY_USER: "${CI_REGISTRY_USER}"
214-
REGISTRY_PASSWORD: "${CI_REGISTRY_PASSWORD}"
215-
REGISTRY: "${CI_REGISTRY}"
216-
DOCKER_FILE: "Dockerfile.dblab-server-zfs08"
217-
DOCKER_NAME: "${CI_REGISTRY}/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/dblab-server"
218-
TAGS: "${DOCKER_NAME}:${CI_COMMIT_REF_SLUG}-zfs0.8"
219-
220209
build-image-feature-ci-checker:
221210
<<: *build_image_definition
222211
<<: *only_feature
@@ -258,14 +247,6 @@ build-image-master-server:
258247
DOCKER_NAME: "registry.gitlab.com/postgres-ai/database-lab/dblab-server"
259248
TAGS: "${DOCKER_NAME}:master,${DOCKER_NAME}:master-${CI_COMMIT_SHORT_SHA}"
260249

261-
build-image-master-server-zfs08:
262-
<<: *build_image_definition
263-
<<: *only_master
264-
variables:
265-
DOCKER_FILE: "Dockerfile.dblab-server-zfs08"
266-
DOCKER_NAME: "registry.gitlab.com/postgres-ai/database-lab/dblab-server"
267-
TAGS: "${DOCKER_NAME}:master-zfs0.8,${DOCKER_NAME}:master-${CI_COMMIT_SHORT_SHA}-zfs0.8"
268-
269250
build-image-master-ci-checker:
270251
<<: *build_image_definition
271252
<<: *only_master
@@ -303,19 +284,6 @@ build-image-latest-server:
303284
- export CLEAN_TAG=$(echo ${CI_COMMIT_TAG#"v"})
304285
- export LATEST_TAG=$(echo ${CLEAN_TAG%.*}-latest)
305286
- export TAGS="${DOCKER_NAME}:${LATEST_TAG},${DOCKER_NAME}:${CLEAN_TAG}"
306-
build-image-latest-server-zfs08:
307-
<<: *build_image_definition
308-
<<: *only_tag_release
309-
variables:
310-
REGISTRY_USER: "${DH_CI_REGISTRY_USER}"
311-
REGISTRY_PASSWORD: "${DH_CI_REGISTRY_PASSWORD}"
312-
REGISTRY: "${DH_CI_REGISTRY}"
313-
DOCKER_FILE: "Dockerfile.dblab-server-zfs08"
314-
DOCKER_NAME: "postgresai/dblab-server"
315-
before_script:
316-
- export CLEAN_TAG=$(echo ${CI_COMMIT_TAG#"v"})
317-
- export LATEST_TAG=$(echo ${CLEAN_TAG%.*}-latest)
318-
- export TAGS="${DOCKER_NAME}:${LATEST_TAG}-zfs0.8,${DOCKER_NAME}:${CLEAN_TAG}-zfs0.8"
319287

320288
build-image-latest-server-dev:
321289
<<: *build_image_definition
@@ -411,18 +379,6 @@ build-image-rc-server:
411379
DOCKER_FILE: "Dockerfile.dblab-server"
412380
DOCKER_NAME: "postgresai/dblab-server"
413381

414-
build-image-rc-server-zfs08:
415-
<<: *build_image_definition
416-
<<: *only_tag_rc
417-
before_script:
418-
- export CLEAN_TAG=$(echo ${CI_COMMIT_TAG#"v"})
419-
- export TAGS="${DOCKER_NAME}:${CLEAN_TAG}-zfs0.8"
420-
variables:
421-
REGISTRY_USER: "${DH_CI_REGISTRY_USER}"
422-
REGISTRY_PASSWORD: "${DH_CI_REGISTRY_PASSWORD}"
423-
REGISTRY: "${DH_CI_REGISTRY}"
424-
DOCKER_FILE: "Dockerfile.dblab-server-zfs08"
425-
DOCKER_NAME: "postgresai/dblab-server"
426382
build-image-rc-server-dev:
427383
<<: *build_image_definition
428384
<<: *only_tag_rc
@@ -435,18 +391,7 @@ build-image-rc-server-dev:
435391
REGISTRY: "${CI_REGISTRY}"
436392
DOCKER_FILE: "Dockerfile.dblab-server"
437393
DOCKER_NAME: "registry.gitlab.com/postgres-ai/database-lab/dblab-server"
438-
build-image-rc-server-dev-zfs08:
439-
<<: *build_image_definition
440-
<<: *only_tag_rc
441-
before_script:
442-
- export CLEAN_TAG=$(echo ${CI_COMMIT_TAG#"v"})
443-
- export TAGS="${DOCKER_NAME}:${CLEAN_TAG}-zfs0.8"
444-
variables:
445-
REGISTRY_USER: "${CI_REGISTRY_USER}"
446-
REGISTRY_PASSWORD: "${CI_REGISTRY_PASSWORD}"
447-
REGISTRY: "${CI_REGISTRY}"
448-
DOCKER_FILE: "Dockerfile.dblab-server-zfs08"
449-
DOCKER_NAME: "registry.gitlab.com/postgres-ai/database-lab/dblab-server"
394+
450395
build-image-rc-ci-checker:
451396
<<: *build_image_definition
452397
<<: *only_tag_rc
@@ -459,6 +404,7 @@ build-image-rc-ci-checker:
459404
REGISTRY: "${DH_CI_REGISTRY}"
460405
DOCKER_FILE: "Dockerfile.ci-checker"
461406
DOCKER_NAME: "postgresai/dblab-ci-checker"
407+
462408
build-image-rc-ci-checker-dev:
463409
<<: *build_image_definition
464410
<<: *only_tag_rc
@@ -510,6 +456,7 @@ build-image-rc-client:
510456
REGISTRY: "${DH_CI_REGISTRY}"
511457
DOCKER_FILE: "Dockerfile.dblab-cli"
512458
DOCKER_NAME: "postgresai/dblab"
459+
513460
build-image-swagger-release:
514461
<<: *build_image_definition
515462
<<: *only_tag_release

engine/Dockerfile.dblab-server-zfs08

Lines changed: 0 additions & 23 deletions
This file was deleted.

engine/scripts/ci_docker_build_push.sh

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,13 @@ set +x
3232
# 2. ZFS-bearing images still ship a working `zfs` binary. We use
3333
# `zfs --help` instead of `zfs --version` because the latter exits
3434
# non-zero when the kernel module is absent (the CI builder is DinD,
35-
# which has none) — `--help` only exercises the userspace binary, so
36-
# it surfaces musl / libblkid ABI breakage without the false negative.
35+
# which has none) — `--help` only exercises the userspace binary.
3736
# 3. None of the daemon / runtime / compose binaries that ship in the
3837
# full `docker:*` image (and are NOT needed in a CLI-only runtime)
3938
# have crept back in. The forbidden list is daemon-side only —
4039
# the `docker` CLI itself is required and stays.
41-
# The zfs08 case is the noisiest because the v3.12 zfs binary now runs
42-
# against the alpine:3.23 musl / libblkid; the help-exit check pins this
43-
# at build time.
4440
case "$docker_file" in
45-
Dockerfile.dblab-server|Dockerfile.dblab-server-debug|Dockerfile.dblab-server-zfs08|Dockerfile.dblab-cli|Dockerfile.ci-checker)
41+
Dockerfile.dblab-server|Dockerfile.dblab-server-debug|Dockerfile.dblab-cli|Dockerfile.ci-checker)
4642
if [ "${#ADDR[@]}" -eq 0 ] || [ -z "${ADDR[0]:-}" ]; then
4743
echo "ERROR: smoke test cannot run, TAGS is empty" >&2
4844
exit 1
@@ -52,7 +48,7 @@ case "$docker_file" in
5248
docker run --rm "$smoke_image" docker --version
5349
set +x
5450
case "$docker_file" in
55-
Dockerfile.dblab-server|Dockerfile.dblab-server-debug|Dockerfile.dblab-server-zfs08)
51+
Dockerfile.dblab-server|Dockerfile.dblab-server-debug)
5652
set -x
5753
docker run --rm "$smoke_image" zfs --help >/dev/null
5854
set +x

0 commit comments

Comments
 (0)