feat: moby docker v27.5.1 (strangelove-ventures#1344)

Author: agouin

.github/workflows/local-interchain.yaml

@@ -32,7 +32,7 @@ jobs:
         run: go mod tidy && make install
 
       - name: Upload localic artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: local-ic
           path: ~/go/bin/local-ic
@@ -52,7 +52,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Download Tarball Artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: local-ic
           path: /tmp
@@ -94,7 +94,7 @@ jobs:
           override: true
 
       - name: Download Tarball Artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: local-ic
           path: /tmp
@@ -137,7 +137,7 @@ jobs:
       - run: pip install -r python/requirements.txt --break-system-packages
 
       - name: Download Tarball Artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: local-ic
           path: /tmp
@@ -175,7 +175,7 @@ jobs:
         run: cd ts && npm ci
 
       - name: Download Tarball Artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: local-ic
           path: /tmp

blockdb/tui/presenter/tx_test.go

@@ -29,7 +29,7 @@ func TestTx(t *testing.T) {
     "foo": true
   }
 }`
-		require.Equal(t, want, pres.Data())
+		require.JSONEq(t, want, pres.Data())
 	})
 
 	t.Run("non-json", func(t *testing.T) {

chain/cosmos/chain_node.go

@@ -18,8 +18,8 @@ import (
 
 	"github.com/avast/retry-go/v4"
 	volumetypes "github.com/docker/docker/api/types/volume"
-	dockerclient "github.com/docker/docker/client"
 	"github.com/docker/go-connections/nat"
+	dockerclient "github.com/moby/moby/client"
 	"go.uber.org/zap"
 	"golang.org/x/mod/semver"
 	"golang.org/x/sync/errgroup"
@@ -1097,13 +1097,13 @@ func (tn *ChainNode) CreateNodeContainer(ctx context.Context) error {
 
 	var cmd []string
 	if chainCfg.NoHostMount {
-		startCmd := fmt.Sprintf("cp -r %s %s_nomnt && %s start --home %s_nomnt --x-crisis-skip-assert-invariants", tn.HomeDir(), tn.HomeDir(), chainCfg.Bin, tn.HomeDir())
+		startCmd := fmt.Sprintf("cp -r %s %s_nomnt && %s start --home %s_nomnt", tn.HomeDir(), tn.HomeDir(), chainCfg.Bin, tn.HomeDir())
 		if len(chainCfg.AdditionalStartArgs) > 0 {
 			startCmd = fmt.Sprintf("%s %s", startCmd, chainCfg.AdditionalStartArgs)
 		}
 		cmd = []string{"sh", "-c", startCmd}
 	} else {
-		cmd = []string{chainCfg.Bin, "start", "--home", tn.HomeDir(), "--x-crisis-skip-assert-invariants"}
+		cmd = []string{chainCfg.Bin, "start", "--home", tn.HomeDir()}
 		if len(chainCfg.AdditionalStartArgs) > 0 {
 			cmd = append(cmd, chainCfg.AdditionalStartArgs...)
 		}

chain/cosmos/cosmos_chain.go

@@ -13,9 +13,9 @@ import (
 	"strings"
 	"sync"
 
-	dockertypes "github.com/docker/docker/api/types"
+	dockerimagetypes "github.com/docker/docker/api/types/image"
 	volumetypes "github.com/docker/docker/api/types/volume"
-	"github.com/docker/docker/client"
+	"github.com/moby/moby/client"
 	"go.uber.org/zap"
 	"golang.org/x/sync/errgroup"
 
@@ -640,7 +640,7 @@ func (c *CosmosChain) pullImages(ctx context.Context, cli *client.Client) {
 		rc, err := cli.ImagePull(
 			ctx,
 			image.Repository+":"+image.Version,
-			dockertypes.ImagePullOptions{},
+			dockerimagetypes.PullOptions{},
 		)
 		if err != nil {
 			c.log.Error("Failed to pull image",

chain/cosmos/sidecar.go

@@ -6,8 +6,8 @@ import (
 	"os"
 
 	"github.com/docker/docker/api/types/mount"
-	dockerclient "github.com/docker/docker/client"
 	"github.com/docker/go-connections/nat"
+	dockerclient "github.com/moby/moby/client"
 	"go.uber.org/zap"
 
 	"github.com/strangelove-ventures/interchaintest/v8/dockerutil"

chain/ethereum/ethererum_chain.go

@@ -6,14 +6,14 @@ import (
 	"io"
 	"time"
 
-	dockertypes "github.com/docker/docker/api/types"
+	dockerimagetypes "github.com/docker/docker/api/types/image"
 	"github.com/docker/docker/api/types/mount"
 	"github.com/docker/docker/api/types/volume"
-	dockerclient "github.com/docker/docker/client"
 	"github.com/docker/go-connections/nat"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/ethclient"
+	dockerclient "github.com/moby/moby/client"
 	"go.uber.org/zap"
 
 	sdkmath "cosmossdk.io/math"
@@ -122,7 +122,7 @@ func (c *EthereumChain) pullImages(ctx context.Context, cli *dockerclient.Client
 		rc, err := cli.ImagePull(
 			ctx,
 			image.Repository+":"+image.Version,
-			dockertypes.ImagePullOptions{},
+			dockerimagetypes.PullOptions{},
 		)
 		if err != nil {
 			c.log.Error("Failed to pull image",

chain/internal/tendermint/tendermint_node.go

@@ -10,9 +10,9 @@ import (
 
 	"github.com/avast/retry-go/v4"
 	volumetypes "github.com/docker/docker/api/types/volume"
-	dockerclient "github.com/docker/docker/client"
 	"github.com/docker/go-connections/nat"
 	"github.com/hashicorp/go-version"
+	dockerclient "github.com/moby/moby/client"
 	"go.uber.org/zap"
 
 	tmjson "github.com/cometbft/cometbft/libs/json"

chain/polkadot/parachain_node.go

@@ -9,11 +9,11 @@ import (
 	"strings"
 
 	"github.com/avast/retry-go/v4"
-	"github.com/docker/docker/client"
 	"github.com/icza/dyno"
 	p2pcrypto "github.com/libp2p/go-libp2p/core/crypto"
 	"github.com/libp2p/go-libp2p/core/peer"
 	gsrpc "github.com/misko9/go-substrate-rpc-client/v4"
+	"github.com/moby/moby/client"
 	"go.uber.org/zap"
 
 	"cosmossdk.io/math"

chain/polkadot/polkadot_chain.go

@@ -10,13 +10,13 @@ import (
 
 	"github.com/99designs/keyring"
 	"github.com/StirlingMarketingGroup/go-namecase"
-	"github.com/docker/docker/api/types"
+	dockerimagetypes "github.com/docker/docker/api/types/image"
 	volumetypes "github.com/docker/docker/api/types/volume"
-	"github.com/docker/docker/client"
 	"github.com/icza/dyno"
 	p2pcrypto "github.com/libp2p/go-libp2p/core/crypto"
 	"github.com/misko9/go-substrate-rpc-client/v4/signature"
 	gstypes "github.com/misko9/go-substrate-rpc-client/v4/types"
+	"github.com/moby/moby/client"
 	"go.uber.org/zap"
 	"golang.org/x/sync/errgroup"
 
@@ -260,7 +260,7 @@ func (c *PolkadotChain) Initialize(ctx context.Context, testName string, cli *cl
 		rc, err := cli.ImagePull(
 			ctx,
 			image.Repository+":"+image.Version,
-			types.ImagePullOptions{},
+			dockerimagetypes.PullOptions{},
 		)
 		if err != nil {
 			c.log.Error("Failed to pull image",

chain/polkadot/relay_chain_node.go

@@ -10,11 +10,11 @@ import (
 
 	"github.com/avast/retry-go/v4"
 	"github.com/decred/dcrd/dcrec/secp256k1/v2"
-	"github.com/docker/docker/client"
 	"github.com/docker/go-connections/nat"
 	p2pCrypto "github.com/libp2p/go-libp2p/core/crypto"
 	"github.com/libp2p/go-libp2p/core/peer"
 	gsrpc "github.com/misko9/go-substrate-rpc-client/v4"
+	"github.com/moby/moby/client"
 	"go.uber.org/zap"
 
 	"cosmossdk.io/math"