diff --git a/cmd/backup/exec.go b/cmd/backup/exec.go index e2c64fe..0dac44e 100644 --- a/cmd/backup/exec.go +++ b/cmd/backup/exec.go @@ -16,7 +16,6 @@ import ( "strings" "github.com/cosiner/argv" - "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/filters" "github.com/docker/docker/pkg/stdcopy" @@ -29,7 +28,7 @@ func (s *script) exec(containerRef string, command string, user string) ([]byte, commandEnv := []string{ fmt.Sprintf("COMMAND_RUNTIME_ARCHIVE_FILEPATH=%s", s.file), } - execID, err := s.cli.ContainerExecCreate(context.Background(), containerRef, types.ExecConfig{ + execID, err := s.cli.ContainerExecCreate(context.Background(), containerRef, container.ExecOptions{ Cmd: args[0], AttachStdin: true, AttachStderr: true, @@ -40,7 +39,7 @@ func (s *script) exec(containerRef string, command string, user string) ([]byte, return nil, nil, errwrap.Wrap(err, "error creating container exec") } - resp, err := s.cli.ContainerExecAttach(context.Background(), execID.ID, types.ExecStartCheck{}) + resp, err := s.cli.ContainerExecAttach(context.Background(), execID.ID, container.ExecStartOptions{}) if err != nil { return nil, nil, errwrap.Wrap(err, "error attaching container exec") } diff --git a/go.mod b/go.mod index 7197bd3..5e60a50 100644 --- a/go.mod +++ b/go.mod @@ -7,8 +7,8 @@ require ( github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.2.1 github.com/containrrr/shoutrrr v0.7.1 github.com/cosiner/argv v0.1.0 - github.com/docker/cli v26.1.4+incompatible - github.com/docker/docker v26.1.0+incompatible + github.com/docker/cli v27.0.3+incompatible + github.com/docker/docker v27.0.3+incompatible github.com/gofrs/flock v0.11.0 github.com/joho/godotenv v1.5.1 github.com/klauspost/compress v1.17.9 diff --git a/go.sum b/go.sum index 8655283..7ca9ab9 100644 --- a/go.sum +++ b/go.sum @@ -257,10 +257,10 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= -github.com/docker/cli v26.1.4+incompatible h1:I8PHdc0MtxEADqYJZvhBrW9bo8gawKwwenxRM7/rLu8= -github.com/docker/cli v26.1.4+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= -github.com/docker/docker v26.1.0+incompatible h1:W1G9MPNbskA6VZWL7b3ZljTh0pXI68FpINx0GKaOdaM= -github.com/docker/docker v26.1.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/cli v27.0.3+incompatible h1:usGs0/BoBW8MWxGeEtqPMkzOY56jZ6kYlSN5BLDioCQ= +github.com/docker/cli v27.0.3+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/docker v27.0.3+incompatible h1:aBGI9TeQ4MPlhquTQKq9XbK79rKFVwXNUAYz9aXyEBE= +github.com/docker/docker v27.0.3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw= diff --git a/test/Dockerfile b/test/Dockerfile index 2ac6728..55647de 100644 --- a/test/Dockerfile +++ b/test/Dockerfile @@ -1,4 +1,4 @@ -FROM docker:26-dind +FROM docker:27-dind RUN apk add \ coreutils \