Add missing packages and rely on $PATH to locate the findmnt binary (#10)

Author: dud225

Dockerfile

@@ -9,9 +9,9 @@ COPY . .
 RUN cd cmd/carina-node && CGO_ENABLED=0 go build -o /tmp/carina-node .
 RUN cd cmd/carina-controller && CGO_ENABLED=0 go build -o /tmp/carina-controller .
 
-FROM alpine:3.20
+FROM alpine:3.23
 
-RUN apk add --no-cache bash bcache-tools device-mapper e2fsprogs eudev lvm2 parted thin-provisioning-tools util-linux xfsprogs
+RUN apk add --no-cache bash bcache-tools bcache-tools-udev device-mapper e2fsprogs e2fsprogs-extra eudev lvm2 parted thin-provisioning-tools util-linux xfsprogs xfsprogs-extra
 
 COPY --from=builder /tmp/carina-node /usr/bin/
 COPY --from=builder /tmp/carina-controller /usr/bin/

pkg/csidriver/driver/node.go

@@ -48,7 +48,7 @@ import (
 const (
 	// DeviceDirectory is a directory where Node service creates device files.
 	DeviceDirectory  = "/dev/carina"
-	findmntCmd       = "/usr/bin/findmnt"
+	findmntCmd       = "findmnt"
 	devicePermission = 0600 | unix.S_IFBLK
 )
 

pkg/devicemanager/partition/partition.go

@@ -245,12 +245,12 @@ func (ld *LocalPartitionImplement) UpdatePartition(name, groups string, size uin
 		partitionNum = p.Number
 		log.Info("Update partition on disk dst: ", fmt.Sprintf("/dev/%s", diskPath), " number:", p.Number, " name:", p.Name, " start:", p.Start, " size: ", p.Last, " last:", p.Last, disk.Table)
 		kname := linux.GetPartitionKname(disk.Path, p.Number)
-		targetPathOut, err := ld.Executor.ExecuteCommandWithOutput("/usr/bin/findmnt", "-S", kname, "--noheadings", "--output=target")
+		targetPathOut, err := ld.Executor.ExecuteCommandWithOutput("findmnt", "-S", kname, "--noheadings", "--output=target")
 		if err != nil {
 			log.Error("targetPathOut ", targetPathOut, " failed: "+err.Error())
 			//skip return err because no mount point is available for target path
 		}
-		log.Info("/usr/bin/findmnt", " -S ", kname, " --noheadings", " --output=target", " targetPathOut: "+targetPathOut)
+		log.Info("findmnt", " -S ", kname, " --noheadings", " --output=target", " targetPathOut: "+targetPathOut)
 
 		targetpath := strings.TrimSpace(strings.TrimSuffix(strings.ReplaceAll(targetPathOut, "\"", ""), "\n"))
 		isMount := strings.Contains(targetpath, "mount")

pkg/devicemanager/partition/partition_test.go

@@ -132,7 +132,7 @@ func TestGetPartitions(t *testing.T) {
 
 func TestMount(t *testing.T) {
 
-	targetPathOut, err := localparttion.Executor.ExecuteCommandWithOutput("/usr/bin/findmnt", "-S", "/dev/loop0", "--noheadings", "--output=target")
+	targetPathOut, err := localparttion.Executor.ExecuteCommandWithOutput("findmnt", "-S", "/dev/loop0", "--noheadings", "--output=target")
 	t.Log("targetPathOut", targetPathOut)
 	if err != nil {
 		t.Log(err.Error())

scheduler/Dockerfile

@@ -7,7 +7,7 @@ COPY . .
 
 RUN cd cmd && CGO_ENABLED=0 go build -o /tmp/carina-scheduler .
 
-FROM alpine:3.20
+FROM alpine:3.23
 
 COPY --from=builder /workspace/debug/scheduler-config.yaml /etc/kubernetes
 COPY --from=builder /workspace/config.json /etc/carina/