Bump github.com/docker/docker from 20.10.18+incompatible to 24.0.6+in…

…compatible (#1898)

* Bump github.com/docker/docker

Bumps [github.com/docker/docker](https://github.com/docker/docker) from 20.10.18+incompatible to 24.0.6+incompatible.
- [Release notes](https://github.com/docker/docker/releases)
- [Commits](moby/moby@v20.10.18...v24.0.6)

---
updated-dependencies:
- dependency-name: github.com/docker/docker
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* Fix breaking changes in rootchain server command

* lint fix

* Increase e2e timeout

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Stefan Negovanović <stefan@ethernal.tech>
Co-authored-by: stana-ethernal <stana.miric@ethernal.tech>

Makefile

@@ -77,7 +77,7 @@ test-e2e-polybft: check-go
 	env EDGE_BINARY=${PWD}/artifacts/polygon-edge \
 	BYZANTINE_BINARY=${PWD}/artifacts/polygon-edge-double-signer \
 	E2E_TESTS=true E2E_LOGS=true \
-	go test -v -timeout=1h30m ./e2e-polybft/e2e/...
+	go test -v -timeout=2h ./e2e-polybft/e2e/...
 
 .PHONY: test-property-polybft
 test-property-polybft: check-go

command/rootchain/helper/utils.go

@@ -83,7 +83,7 @@ func DecodePrivateKey(rawKey string) (ethgo.Key, error) {
 }
 
 func GetRootchainID() (string, error) {
-	cli, err := client.NewClientWithOpts(client.FromEnv)
+	cli, err := client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation())
 	if err != nil {
 		return "", fmt.Errorf("rootchain id error: %w", err)
 	}

command/rootchain/server/result.go

@@ -14,8 +14,8 @@ type containerStopResult struct {
 	Err    string `json:"err"`
 }
 
-func newContainerStopResult(status container.ContainerWaitOKBody) *containerStopResult {
-	var errMsg string
+func newContainerStopResult(status container.WaitResponse) *containerStopResult {
+	errMsg := ""
 	if status.Error != nil {
 		errMsg = status.Error.Message
 	}

command/rootchain/server/server.go

@@ -129,7 +129,8 @@ func runCommand(cmd *cobra.Command, _ []string) {
 
 func runRootchain(ctx context.Context, outputter command.OutputFormatter, closeCh chan struct{}) error {
 	var err error
-	if dockerClient, err = dockerclient.NewClientWithOpts(dockerclient.FromEnv); err != nil {
+	if dockerClient, err = dockerclient.NewClientWithOpts(dockerclient.FromEnv,
+		dockerclient.WithAPIVersionNegotiation()); err != nil {
 		return err
 	}
 
@@ -289,7 +290,7 @@ func handleSignals(ctx context.Context, closeCh <-chan struct{}) error {
 
 	// close the container if possible
 	if stop {
-		if err := dockerClient.ContainerStop(ctx, dockerContainerID, nil); err != nil {
+		if err := dockerClient.ContainerStop(ctx, dockerContainerID, container.StopOptions{}); err != nil {
 			return fmt.Errorf("failed to stop container: %w", err)
 		}
 	}

go.mod

@@ -59,7 +59,7 @@ require (
 
 require (
 	github.com/0xPolygon/go-ibft v0.4.1-0.20230717081138-628065cf23b6
-	github.com/docker/docker v20.10.18+incompatible
+	github.com/docker/docker v24.0.6+incompatible
 	github.com/docker/go-connections v0.4.0
 	go.etcd.io/bbolt v1.3.7
 )

go.sum

@@ -145,8 +145,8 @@ github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2 h1:tdlZCpZ/P9DhczC
 github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
 github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8=
 github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
-github.com/docker/docker v20.10.18+incompatible h1:SN84VYXTBNGn92T/QwIRPlum9zfemfitN7pbsp26WSc=
-github.com/docker/docker v20.10.18+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v24.0.6+incompatible h1:hceabKCtUgDqPu+qm0NgsaXf28Ljf4/pWFL7xjWWDgE=
+github.com/docker/docker v24.0.6+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/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=