diff options
| author | Brian Goff <cpuguy@hey.com> | 2021-07-26 10:47:28 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-26 10:47:28 -0700 |
| commit | 12f1b3ce43fe4aea5a41750bcc20f2a7dd67dbfc (patch) | |
| tree | 135d452c68e7cacb106da23797fa97115918dd59 /container | |
| parent | 9674540ccff358c3cd84cc2f33c3503e0dab7fb7 (diff) | |
| parent | 28409ca6c76030ef1cd277cf73223a47cf3f1dbe (diff) | |
| download | docker-12f1b3ce43fe4aea5a41750bcc20f2a7dd67dbfc.tar.gz | |
Merge pull request #42616 from thaJeztah/migrate_pkg_signal
replace pkg/signal with moby/sys/signal v0.5.0
Diffstat (limited to 'container')
| -rw-r--r-- | container/container.go | 2 | ||||
| -rw-r--r-- | container/container_unit_test.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/container/container.go b/container/container.go index 2f3675c54e..3cc248c315 100644 --- a/container/container.go +++ b/container/container.go @@ -31,13 +31,13 @@ import ( "github.com/docker/docker/pkg/containerfs" "github.com/docker/docker/pkg/idtools" "github.com/docker/docker/pkg/ioutils" - "github.com/docker/docker/pkg/signal" "github.com/docker/docker/pkg/system" "github.com/docker/docker/restartmanager" "github.com/docker/docker/volume" volumemounts "github.com/docker/docker/volume/mounts" units "github.com/docker/go-units" agentexec "github.com/docker/swarmkit/agent/exec" + "github.com/moby/sys/signal" "github.com/moby/sys/symlink" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/container/container_unit_test.go b/container/container_unit_test.go index 1314f37f43..0db8ac1beb 100644 --- a/container/container_unit_test.go +++ b/container/container_unit_test.go @@ -10,7 +10,7 @@ import ( "github.com/docker/docker/api/types/container" swarmtypes "github.com/docker/docker/api/types/swarm" "github.com/docker/docker/daemon/logger/jsonfilelog" - "github.com/docker/docker/pkg/signal" + "github.com/moby/sys/signal" "gotest.tools/v3/assert" ) |