rob/octoplex
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

chore: enable Docker API version negotiation

Browse Source
This commit is contained in:
Rob Watson 2025-04-01 20:33:27 +02:00
parent b05bc6f98b
commit ba356137c3
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/app/integration_test.go
View File

@ -46,7 +46,7 @@ func TestIntegration(t *testing.T) {
logger := testhelpers.NewTestLogger(t).With("component", "integration") logger := testhelpers.NewTestLogger(t).With("component", "integration")
logger.Info("Initialised logger", "debug_level", logger.Enabled(ctx, slog.LevelDebug), "runner_debug", os.Getenv("RUNNER_DEBUG")) logger.Info("Initialised logger", "debug_level", logger.Enabled(ctx, slog.LevelDebug), "runner_debug", os.Getenv("RUNNER_DEBUG"))
dockerClient, err := dockerclient.NewClientWithOpts(dockerclient.FromEnv) dockerClient, err := dockerclient.NewClientWithOpts(dockerclient.FromEnv, dockerclient.WithAPIVersionNegotiation())
require.NoError(t, err) require.NoError(t, err)
screen, screenCaptureC, getContents := setupSimulationScreen(t) screen, screenCaptureC, getContents := setupSimulationScreen(t)
@ -246,7 +246,7 @@ func TestIntegrationDestinationValidations(t *testing.T) {
defer cancel() defer cancel()
logger := testhelpers.NewTestLogger(t).With("component", "integration") logger := testhelpers.NewTestLogger(t).With("component", "integration")
dockerClient, err := dockerclient.NewClientWithOpts(dockerclient.FromEnv) dockerClient, err := dockerclient.NewClientWithOpts(dockerclient.FromEnv, dockerclient.WithAPIVersionNegotiation())
require.NoError(t, err) require.NoError(t, err)
screen, screenCaptureC, getContents := setupSimulationScreen(t) screen, screenCaptureC, getContents := setupSimulationScreen(t)

6
internal/container/integration_test.go
View File

@ -23,7 +23,7 @@ func TestIntegrationClientStartStop(t *testing.T) {
t.Cleanup(cancel) t.Cleanup(cancel)
logger := testhelpers.NewTestLogger(t) logger := testhelpers.NewTestLogger(t)
apiClient, err := client.NewClientWithOpts(client.FromEnv) apiClient, err := client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation())
require.NoError(t, err) require.NoError(t, err)
containerName := "octoplex-test-" + shortid.New().String() containerName := "octoplex-test-" + shortid.New().String()
component := "test-start-stop" component := "test-start-stop"
@ -73,7 +73,7 @@ func TestIntegrationClientRemoveContainers(t *testing.T) {
t.Cleanup(cancel) t.Cleanup(cancel)
logger := testhelpers.NewTestLogger(t) logger := testhelpers.NewTestLogger(t)
apiClient, err := client.NewClientWithOpts(client.FromEnv) apiClient, err := client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation())
require.NoError(t, err) require.NoError(t, err)
component := "test-remove-containers" component := "test-remove-containers"
@ -172,7 +172,7 @@ func TestContainerRestart(t *testing.T) {
t.Cleanup(cancel) t.Cleanup(cancel)
logger := testhelpers.NewTestLogger(t) logger := testhelpers.NewTestLogger(t)
apiClient, err := client.NewClientWithOpts(client.FromEnv) apiClient, err := client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation())
require.NoError(t, err) require.NoError(t, err)
containerName := "octoplex-test-" + shortid.New().String() containerName := "octoplex-test-" + shortid.New().String()
component := "test-restart" component := "test-restart"

5
main.go
View File

@ -76,7 +76,10 @@ func run(ctx context.Context) error {
clipboardAvailable = true clipboardAvailable = true
} }
dockerClient, err := dockerclient.NewClientWithOpts(dockerclient.FromEnv) dockerClient, err := dockerclient.NewClientWithOpts(
dockerclient.FromEnv,
dockerclient.WithAPIVersionNegotiation(),
)
if err != nil { if err != nil {
return fmt.Errorf("new docker client: %w", err) return fmt.Errorf("new docker client: %w", err)
} }