Skip to content

Commit

Permalink
Revert to an older docker module
Browse files Browse the repository at this point in the history
  • Loading branch information
gesellix committed Jul 31, 2022
1 parent b84c700 commit 0de5f62
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 111 deletions.
15 changes: 5 additions & 10 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,21 @@ module github.com/testcontainers/moby-ryuk
go 1.18

require (
github.com/docker/docker v20.10.17+incompatible
github.com/docker/docker v1.4.2-0.20170502054910-90d35abf7b35
gopkg.in/matryer/try.v1 v1.0.0-20150601225556-312d2599e12e
)

require (
github.com/Microsoft/go-winio v0.5.2 // indirect
github.com/cheekybits/is v0.0.0-20150225183255-68e9c0620927 // indirect
github.com/Sirupsen/logrus v1.0.6 // indirect
github.com/docker/distribution v2.8.1+incompatible // indirect
github.com/docker/go-connections v0.4.0 // indirect
github.com/docker/go-units v0.4.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/matryer/try v0.0.0-20161228173917-9ac251b645a2 // indirect
github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
github.com/morikuni/aec v1.0.0 // indirect
github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.0.2 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/sirupsen/logrus v1.9.0 // indirect
golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa // indirect
golang.org/x/net v0.0.0-20220728211354-c7608f3a8462 // indirect
golang.org/x/sys v0.0.0-20220730100132-1609e554cd39 // indirect
golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9 // indirect
gotest.tools/v3 v3.3.0 // indirect
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
)
98 changes: 0 additions & 98 deletions go.sum

This file was deleted.

6 changes: 3 additions & 3 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ func main() {
flag.Parse()
log.Println("Pinging Docker...")

cli, err := client.NewClientWithOpts(client.FromEnv)
cli, err := client.NewEnvClient()
if err == nil {
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
defer cancel()
Expand Down Expand Up @@ -111,7 +111,7 @@ func processRequests(deathNote *sync.Map, firstConnected chan<- bool, wg *sync.W
args.Add(filterType, value)
}
}
param, err := filters.ToJSON(args)
param, err := filters.ToParam(args)

if err != nil {
log.Println(err)
Expand Down Expand Up @@ -148,7 +148,7 @@ func prune(cli *client.Client, deathNote *sync.Map) {
param := fmt.Sprint(note)
log.Printf("Deleting %s\n", param)

args, err := filters.FromJSON(param)
args, err := filters.FromParam(param)
if err != nil {
log.Println(err)
return true
Expand Down

0 comments on commit 0de5f62

Please sign in to comment.