Skip to content

Commit 98b8d7e

Browse files
committed
fix: update base Docker image and package versions to avoid lsblk segfault
1 parent 8b1a123 commit 98b8d7e

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

engine/Dockerfile.dblab-server

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# See Guides to learn how to start a container: https://postgres.ai/docs/how-to-guides/administration/engine-manage
22

3-
FROM docker:20.10.12
3+
FROM docker:20.10.24
44

55
# Install dependencies
66
RUN apk update \
7-
&& apk add zfs=2.1.4-r0 --no-cache --repository=https://dl-cdn.alpinelinux.org/alpine/edge/main \
7+
&& apk add zfs=2.1.9-r1 --no-cache --repository=https://dl-cdn.alpinelinux.org/alpine/edge/main \
88
&& apk add --no-cache lvm2 bash util-linux
99

1010
WORKDIR /home/dblab

engine/internal/provision/pool/block_devices.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,13 @@ package pool
77

88
import (
99
"encoding/json"
10+
"fmt"
1011
"os/exec"
1112

1213
"github.com/pkg/errors"
1314

1415
"gitlab.com/postgres-ai/database-lab/v3/internal/provision/thinclones/lvm"
16+
"gitlab.com/postgres-ai/database-lab/v3/pkg/log"
1517
)
1618

1719
type blockDeviceList struct {
@@ -27,7 +29,8 @@ type blockDevice struct {
2729
func getBlockDeviceTypes() (map[string]string, error) {
2830
output, err := exec.Command("lsblk", "--json", "--output", "type,mountpoint").Output()
2931
if err != nil {
30-
return nil, errors.Wrap(err, "failed to run command")
32+
log.Err(output)
33+
return nil, fmt.Errorf("failed to run command: %w", err)
3134
}
3235

3336
var blockDevices blockDeviceList

0 commit comments

Comments
 (0)