Merge branch 'zfs-package' into 'master'

NikolayS · NikolayS · commit 3d17e3376d43 · 2023-04-19T20:19:55.000Z
fix: remove zfs version specification

See merge request postgres-ai/database-lab!724
diff --git a/engine/Dockerfile.ci-checker b/engine/Dockerfile.ci-checker
@@ -1,4 +1,4 @@
-FROM docker:20.10.12
+FROM docker:20.10.24
 
 # Install dependencies.
 RUN apk update && apk add --no-cache bash
diff --git a/engine/Dockerfile.dblab-cli b/engine/Dockerfile.dblab-cli
@@ -1,4 +1,4 @@
-FROM docker:20.10.12
+FROM docker:20.10.24
 
 # Install dependencies.
 RUN apk update && apk add --no-cache bash jq
diff --git a/engine/Dockerfile.dblab-server b/engine/Dockerfile.dblab-server
@@ -4,8 +4,7 @@ FROM docker:20.10.24
 
 # Install dependencies
 RUN apk update \
-  && apk add zfs=2.1.9-r1 --no-cache --repository=https://dl-cdn.alpinelinux.org/alpine/edge/main \
-  && apk add --no-cache lvm2 bash util-linux
+  && apk add --no-cache zfs lvm2 bash util-linux
 
 WORKDIR /home/dblab
 
diff --git a/engine/Dockerfile.dblab-server-zfs08 b/engine/Dockerfile.dblab-server-zfs08
@@ -1,6 +1,6 @@
 # See Guides to learn how to start a container: https://postgres.ai/docs/how-to-guides/administration/engine-manage
 
-FROM docker:20.10.12
+FROM docker:20.10.24
 
 # Install dependencies.
 RUN apk update && apk add zfs=0.8.4-r0 --no-cache --repository=https://dl-cdn.alpinelinux.org/alpine/v3.12/main \

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM docker:20.10.12`
	`1`	`+FROM docker:20.10.24`
`2`	`2`
`3`	`3`	`# Install dependencies.`
`4`	`4`	`RUN apk update && apk add --no-cache bash`