1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39
|
From: Reinhard Tartler <siretart@tauware.de>
Date: Mon, 27 Oct 2025 15:01:14 -0400
X-Dgit-Generated: 1.4.6-10.1 0458aec25af446071f185aafd60250f28c7d1da8
Subject: Fix compilation with docker27, Closes: #1118455
---
diff --git a/pkg/metabase/container.go b/pkg/metabase/container.go
index 2368a9b..131a5c9 100644
--- a/pkg/metabase/container.go
+++ b/pkg/metabase/container.go
@@ -6,7 +6,7 @@ import (
"fmt"
"runtime"
- "github.com/docker/docker/api/types"
+ "github.com/docker/docker/api/types/image"
"github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/mount"
"github.com/docker/docker/client"
@@ -46,7 +46,7 @@ func NewContainer(listenAddr string, listenPort string, sharedFolder string, con
func (c *Container) Create() error {
ctx := context.Background()
log.Printf("Pulling docker image %s", c.Image)
- reader, err := c.CLI.ImagePull(ctx, c.Image, types.ImagePullOptions{})
+ reader, err := c.CLI.ImagePull(ctx, c.Image, image.PullOptions{})
if err != nil {
return fmt.Errorf("failed to pull docker image : %s", err)
}
@@ -168,7 +168,7 @@ func RemoveImageContainer() error {
}
ctx := context.Background()
log.Printf("Removing docker image '%s'", metabaseImage)
- if _, err := cli.ImageRemove(ctx, metabaseImage, types.ImageRemoveOptions{}); err != nil {
+ if _, err := cli.ImageRemove(ctx, metabaseImage, image.RemoveOptions{}); err != nil {
return fmt.Errorf("failed to remove image container %s : %s", metabaseImage, err)
}
return nil
|