Bump docker dependency and fix import.

go.mod

@@ -17,7 +17,7 @@ require (
  github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.0.0-20231213181459-b0fcec718dc6
  github.com/chrismellard/docker-credential-acr-env v0.0.0-20230304212654-82a0ddb27589
  github.com/containerd/cgroups v1.1.0 // indirect
- github.com/docker/docker v23.0.5+incompatible
+ github.com/docker/docker v24.0.7+incompatible
  github.com/go-git/go-billy/v5 v5.5.0
  github.com/go-git/go-git/v5 v5.11.0
  github.com/golang/mock v1.6.0
@@ -118,11 +118,11 @@ require (
  github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
  github.com/mitchellh/go-homedir v1.1.0 // indirect
  github.com/moby/locker v1.0.1 // indirect
- github.com/moby/patternmatcher v0.5.0 // indirect
+ github.com/moby/patternmatcher v0.6.0
  github.com/moby/sys/mount v0.3.3 // indirect
  github.com/moby/sys/mountinfo v0.6.2 // indirect
  github.com/moby/sys/sequential v0.5.0 // indirect
- github.com/moby/sys/signal v0.7.0 // indirect
+ github.com/moby/sys/signal v0.7.0
  github.com/moby/sys/symlink v0.2.0 // indirect
  github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
  github.com/morikuni/aec v1.0.0 // indirect
@@ -158,14 +158,22 @@ require (
 
 require (
  dario.cat/mergo v1.0.0 // indirect
+ github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
+ github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20230306123547-8075edf89bb0 // indirect
  github.com/Azure/azure-sdk-for-go v61.3.0+incompatible // indirect
  github.com/Microsoft/hcsshim v0.11.4 // indirect
  github.com/aws/aws-sdk-go-v2/service/ecr v1.24.5 // indirect
  github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.21.5 // indirect
  github.com/cloudflare/circl v1.3.3 // indirect
+ github.com/containerd/cgroups/v3 v3.0.2 // indirect
  github.com/containerd/log v0.1.0 // indirect
+ github.com/containerd/ttrpc v1.2.2 // indirect
+ github.com/containerd/typeurl/v2 v2.1.1 // indirect
  github.com/cyphar/filepath-securejoin v0.2.4 // indirect
+ github.com/felixge/httpsnoop v1.0.3 // indirect
  github.com/fsnotify/fsnotify v1.6.0 // indirect
+ github.com/go-logr/logr v1.2.4 // indirect
+ github.com/go-logr/stdr v1.2.2 // indirect
  github.com/google/go-querystring v1.1.0 // indirect
  github.com/google/s2a-go v0.1.7 // indirect
  github.com/google/subcommands v1.2.0 // indirect
@@ -181,6 +189,10 @@ require (
  github.com/spf13/viper v1.8.1 // indirect
  github.com/subosito/gotenv v1.2.0 // indirect
  github.com/toqueteos/webbrowser v1.2.0 // indirect
+ go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 // indirect
+ go.opentelemetry.io/otel v1.19.0 // indirect
+ go.opentelemetry.io/otel/metric v1.19.0 // indirect
+ go.opentelemetry.io/otel/trace v1.19.0 // indirect
  google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect
  google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect
  gopkg.in/ini.v1 v1.62.0 // indirect

pkg/commands/stopsignal.go

@@ -19,9 +19,9 @@ package commands
 import (
  "github.com/GoogleContainerTools/kaniko/pkg/dockerfile"
  "github.com/GoogleContainerTools/kaniko/pkg/util"
- "github.com/docker/docker/pkg/signal"
  v1 "github.com/google/go-containerregistry/pkg/v1"
  "github.com/moby/buildkit/frontend/dockerfile/instructions"
+ "github.com/moby/sys/signal"
  "github.com/sirupsen/logrus"
 )
 

pkg/util/fs_util.go

@@ -33,10 +33,10 @@ import (
  "github.com/GoogleContainerTools/kaniko/pkg/config"
  "github.com/GoogleContainerTools/kaniko/pkg/timing"
  "github.com/docker/docker/pkg/archive"
- "github.com/docker/docker/pkg/fileutils"
  v1 "github.com/google/go-containerregistry/pkg/v1"
  "github.com/karrick/godirwalk"
  "github.com/moby/buildkit/frontend/dockerfile/dockerignore"
+ "github.com/moby/patternmatcher"
  otiai10Cpy "github.com/otiai10/copy"
  "github.com/pkg/errors"
  "github.com/sirupsen/logrus"
@@ -788,7 +788,7 @@ func (c FileContext) ExcludesFile(path string) bool {
  return false
  }
  }
- match, err := fileutils.Matches(path, c.ExcludedFiles)
+ match, err := patternmatcher.Matches(path, c.ExcludedFiles)
  if err != nil {
  logrus.Errorf("Error matching, including %s in build: %v", path, err)
  return false