Merge branch 'zfs2-images' into 'master'

fix(engine): use zfs2 in Docker images by default

See merge request postgres-ai/database-lab!515

Author: agneum

engine/.gitlab-ci.yml

@@ -159,16 +159,16 @@ build-image-feature-server:
     DOCKER_NAME: "${CI_REGISTRY}/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/dblab-server"
     TAGS: "${DOCKER_NAME}:${CI_COMMIT_REF_SLUG}"
 
-build-image-feature-server-zfs2:
+build-image-feature-server-zfs08:
   <<: *build_image_definition
   <<: *only_feature
   variables:
     REGISTRY_USER: "${CI_REGISTRY_USER}"
     REGISTRY_PASSWORD: "${CI_REGISTRY_PASSWORD}"
     REGISTRY: "${CI_REGISTRY}"
-    DOCKER_FILE: "Dockerfile.dblab-server-zfs2"
+    DOCKER_FILE: "Dockerfile.dblab-server-zfs08"
     DOCKER_NAME: "${CI_REGISTRY}/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/dblab-server"
-    TAGS: "${DOCKER_NAME}:${CI_COMMIT_REF_SLUG}-zfs2"
+    TAGS: "${DOCKER_NAME}:${CI_COMMIT_REF_SLUG}-zfs0.8"
 
 build-image-feature-ci-checker:
   <<: *build_image_definition
@@ -200,13 +200,13 @@ build-image-master-server:
     DOCKER_NAME: "registry.gitlab.com/postgres-ai/database-lab/dblab-server"
     TAGS: "${DOCKER_NAME}:master,${DOCKER_NAME}:master-${CI_COMMIT_SHORT_SHA}"
 
-build-image-master-server-zfs2:
+build-image-master-server-zfs08:
   <<: *build_image_definition
   <<: *only_master
   variables:
-    DOCKER_FILE: "Dockerfile.dblab-server-zfs2"
+    DOCKER_FILE: "Dockerfile.dblab-server-zfs08"
     DOCKER_NAME: "registry.gitlab.com/postgres-ai/database-lab/dblab-server"
-    TAGS: "${DOCKER_NAME}:master-zfs2,${DOCKER_NAME}:master-${CI_COMMIT_SHORT_SHA}-zfs2"
+    TAGS: "${DOCKER_NAME}:master-zfs0.8,${DOCKER_NAME}:master-${CI_COMMIT_SHORT_SHA}-zfs0.8"
 
 build-image-master-ci-checker:
   <<: *build_image_definition
@@ -238,19 +238,19 @@ build-image-latest-server:
     - export LATEST_TAG=$(echo ${CLEAN_TAG%.*}-latest)
     - export TAGS="${DOCKER_NAME}:${LATEST_TAG},${DOCKER_NAME}:${CLEAN_TAG}"
 
-build-image-latest-server-zfs2:
+build-image-latest-server-zfs08:
   <<: *build_image_definition
   <<: *only_tag_release
   variables:
     REGISTRY_USER: "${DH_CI_REGISTRY_USER}"
     REGISTRY_PASSWORD: "${DH_CI_REGISTRY_PASSWORD}"
     REGISTRY: "${DH_CI_REGISTRY}"
-    DOCKER_FILE: "Dockerfile.dblab-server-zfs2"
+    DOCKER_FILE: "Dockerfile.dblab-server-zfs08"
     DOCKER_NAME: "postgresai/dblab-server"
   before_script:
     - export CLEAN_TAG=$(echo ${CI_COMMIT_TAG#"v"})
     - export LATEST_TAG=$(echo ${CLEAN_TAG%.*}-latest)
-    - export TAGS="${DOCKER_NAME}:${LATEST_TAG}-zfs2,${DOCKER_NAME}:${CLEAN_TAG}-zfs2"
+    - export TAGS="${DOCKER_NAME}:${LATEST_TAG}-zfs0.8,${DOCKER_NAME}:${CLEAN_TAG}-zfs0.8"
 
 build-image-latest-server-dev:
   <<: *build_image_definition
@@ -319,17 +319,17 @@ build-image-rc-server:
     DOCKER_FILE: "Dockerfile.dblab-server"
     DOCKER_NAME: "postgresai/dblab-server"
 
-build-image-rc-server-zfs2:
+build-image-rc-server-zfs08:
   <<: *build_image_definition
   <<: *only_tag_rc
   before_script:
     - export CLEAN_TAG=$(echo ${CI_COMMIT_TAG#"v"})
-    - export TAGS="${DOCKER_NAME}:${CLEAN_TAG}-zfs2"
+    - export TAGS="${DOCKER_NAME}:${CLEAN_TAG}-zfs0.8"
   variables:
     REGISTRY_USER: "${DH_CI_REGISTRY_USER}"
     REGISTRY_PASSWORD: "${DH_CI_REGISTRY_PASSWORD}"
     REGISTRY: "${DH_CI_REGISTRY}"
-    DOCKER_FILE: "Dockerfile.dblab-server-zfs2"
+    DOCKER_FILE: "Dockerfile.dblab-server-zfs08"
     DOCKER_NAME: "postgresai/dblab-server"
 
 build-image-rc-server-dev:
@@ -345,6 +345,19 @@ build-image-rc-server-dev:
     DOCKER_FILE: "Dockerfile.dblab-server"
     DOCKER_NAME: "registry.gitlab.com/postgres-ai/database-lab/dblab-server"
 
+build-image-rc-server-dev-zfs08:
+  <<: *build_image_definition
+  <<: *only_tag_rc
+  before_script:
+    - export CLEAN_TAG=$(echo ${CI_COMMIT_TAG#"v"})
+    - export TAGS="${DOCKER_NAME}:${CLEAN_TAG}-zfs0.8"
+  variables:
+    REGISTRY_USER: "${CI_REGISTRY_USER}"
+    REGISTRY_PASSWORD: "${CI_REGISTRY_PASSWORD}"
+    REGISTRY: "${CI_REGISTRY}"
+    DOCKER_FILE: "Dockerfile.dblab-server-zfs08"
+    DOCKER_NAME: "registry.gitlab.com/postgres-ai/database-lab/dblab-server"
+
 build-image-rc-ci-checker:
   <<: *build_image_definition
   <<: *only_tag_rc

engine/Dockerfile.dblab-server

@@ -2,8 +2,9 @@
 
 FROM docker:20.10.12
 
-# Install dependencies.
-RUN apk update && apk add zfs=0.8.4-r0 --no-cache --repository=https://dl-cdn.alpinelinux.org/alpine/v3.12/main \
+# Install dependencies
+RUN apk update \
+  && apk add zfs=2.1.2-r0 --no-cache --repository=https://dl-cdn.alpinelinux.org/alpine/edge/main \
   && apk add --no-cache lvm2 bash util-linux
 RUN echo 'http://dl-cdn.alpinelinux.org/alpine/v3.13/main' >> /etc/apk/repositories \
   && echo 'http://dl-cdn.alpinelinux.org/alpine/v3.13/community' >> /etc/apk/repositories \

engine/Dockerfile.dblab-server-zfs2 renamed to engine/Dockerfile.dblab-server-zfs08

@@ -2,9 +2,8 @@
 
 FROM docker:20.10.12
 
-# Install dependencies
-RUN apk update \
-  && apk add zfs=2.1.2-r0 --no-cache --repository=https://dl-cdn.alpinelinux.org/alpine/edge/main \
+# Install dependencies.
+RUN apk update && apk add zfs=0.8.4-r0 --no-cache --repository=https://dl-cdn.alpinelinux.org/alpine/v3.12/main \
   && apk add --no-cache lvm2 bash util-linux
 RUN echo 'http://dl-cdn.alpinelinux.org/alpine/v3.13/main' >> /etc/apk/repositories \
   && echo 'http://dl-cdn.alpinelinux.org/alpine/v3.13/community' >> /etc/apk/repositories \