From d798d91d592d37f4294dfab279694943ffc49742 Mon Sep 17 00:00:00 2001 From: Casey Lee Date: Mon, 10 Jul 2023 21:55:53 -0700 Subject: [PATCH] Bump dockercli (#1905) * updates to support newer version of docker sdk Bumps [github.com/docker/cli](https://github.com/docker/cli) from 24.0.2+incompatible to 24.0.4+incompatible. - [Commits](https://github.com/docker/cli/compare/v24.0.2...v24.0.4) --- updated-dependencies: - dependency-name: github.com/docker/cli dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * feat: upgrade to go 1.20 * feat: upgrade to go 1.20 * chore: use go version from go.mod --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/checks.yml | 9 ++++----- .github/workflows/promote.yml | 5 +---- .github/workflows/release.yml | 5 +---- act/container/docker_auth.go | 16 ++++++++-------- act/container/docker_pull.go | 3 ++- act/container/docker_volume.go | 9 +++++---- 6 files changed, 21 insertions(+), 26 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 40f060f1..0ba0ad56 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -8,7 +8,6 @@ concurrency: env: ACT_OWNER: ${{ github.repository_owner }} ACT_REPOSITORY: ${{ github.repository }} - GO_VERSION: 1.18 CGO_ENABLED: 0 jobs: @@ -21,7 +20,7 @@ jobs: fetch-depth: 0 - uses: actions/setup-go@v4 with: - go-version: ${{ env.GO_VERSION }} + go-version-file: go.mod check-latest: true - uses: golangci/golangci-lint-action@v3.6.0 with: @@ -46,7 +45,7 @@ jobs: uses: docker/setup-qemu-action@v2 - uses: actions/setup-go@v4 with: - go-version: ${{ env.GO_VERSION }} + go-version-file: go.mod check-latest: true - uses: actions/cache@v3 if: ${{ !env.ACT }} @@ -81,7 +80,7 @@ jobs: fetch-depth: 2 - uses: actions/setup-go@v4 with: - go-version: ${{ env.GO_VERSION }} + go-version-file: go.mod check-latest: true - name: Run Tests uses: ./.github/actions/run-tests @@ -96,7 +95,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v4 with: - go-version: ${{ env.GO_VERSION }} + go-version-file: go.mod check-latest: true - uses: actions/cache@v3 if: ${{ !env.ACT }} diff --git a/.github/workflows/promote.yml b/.github/workflows/promote.yml index 7ea6c2ab..d6cd1eab 100644 --- a/.github/workflows/promote.yml +++ b/.github/workflows/promote.yml @@ -4,9 +4,6 @@ on: - cron: '0 2 1 * *' workflow_dispatch: {} -env: - GO_VERSION: 1.18 - jobs: release: name: promote @@ -20,7 +17,7 @@ jobs: - uses: fregante/setup-git-user@v2 - uses: actions/setup-go@v4 with: - go-version: ${{ env.GO_VERSION }} + go-version-file: go.mod check-latest: true - uses: actions/cache@v3 if: ${{ !env.ACT }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index dd053ca8..9d4a45ab 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,9 +4,6 @@ on: tags: - v* -env: - GO_VERSION: 1.18 - jobs: release: name: release @@ -17,7 +14,7 @@ jobs: fetch-depth: 0 - uses: actions/setup-go@v4 with: - go-version: ${{ env.GO_VERSION }} + go-version-file: go.mod check-latest: true - uses: actions/cache@v3 if: ${{ !env.ACT }} diff --git a/act/container/docker_auth.go b/act/container/docker_auth.go index e47fe64a..9c263f55 100644 --- a/act/container/docker_auth.go +++ b/act/container/docker_auth.go @@ -8,16 +8,16 @@ import ( "github.com/docker/cli/cli/config" "github.com/docker/cli/cli/config/credentials" - "github.com/docker/docker/api/types" + "github.com/docker/docker/api/types/registry" "github.com/nektos/act/pkg/common" ) -func LoadDockerAuthConfig(ctx context.Context, image string) (types.AuthConfig, error) { +func LoadDockerAuthConfig(ctx context.Context, image string) (registry.AuthConfig, error) { logger := common.Logger(ctx) config, err := config.Load(config.Dir()) if err != nil { logger.Warnf("Could not load docker config: %v", err) - return types.AuthConfig{}, err + return registry.AuthConfig{}, err } if !config.ContainsAuth() { @@ -33,13 +33,13 @@ func LoadDockerAuthConfig(ctx context.Context, image string) (types.AuthConfig, authConfig, err := config.GetAuthConfig(hostName) if err != nil { logger.Warnf("Could not get auth config from docker config: %v", err) - return types.AuthConfig{}, err + return registry.AuthConfig{}, err } - return types.AuthConfig(authConfig), nil + return registry.AuthConfig(authConfig), nil } -func LoadDockerAuthConfigs(ctx context.Context) map[string]types.AuthConfig { +func LoadDockerAuthConfigs(ctx context.Context) map[string]registry.AuthConfig { logger := common.Logger(ctx) config, err := config.Load(config.Dir()) if err != nil { @@ -52,9 +52,9 @@ func LoadDockerAuthConfigs(ctx context.Context) map[string]types.AuthConfig { } creds, _ := config.GetAllCredentials() - authConfigs := make(map[string]types.AuthConfig, len(creds)) + authConfigs := make(map[string]registry.AuthConfig, len(creds)) for k, v := range creds { - authConfigs[k] = types.AuthConfig(v) + authConfigs[k] = registry.AuthConfig(v) } return authConfigs diff --git a/act/container/docker_pull.go b/act/container/docker_pull.go index 6fb29613..ad75958f 100644 --- a/act/container/docker_pull.go +++ b/act/container/docker_pull.go @@ -11,6 +11,7 @@ import ( "github.com/docker/distribution/reference" "github.com/docker/docker/api/types" + "github.com/docker/docker/api/types/registry" "github.com/nektos/act/pkg/common" ) @@ -82,7 +83,7 @@ func getImagePullOptions(ctx context.Context, input NewDockerPullExecutorInput) if input.Username != "" && input.Password != "" { logger.Debugf("using authentication for docker pull") - authConfig := types.AuthConfig{ + authConfig := registry.AuthConfig{ Username: input.Username, Password: input.Password, } diff --git a/act/container/docker_volume.go b/act/container/docker_volume.go index 6eafd33c..0bb2cd7c 100644 --- a/act/container/docker_volume.go +++ b/act/container/docker_volume.go @@ -6,10 +6,11 @@ import ( "context" "github.com/docker/docker/api/types/filters" + "github.com/docker/docker/api/types/volume" "github.com/nektos/act/pkg/common" ) -func NewDockerVolumeRemoveExecutor(volume string, force bool) common.Executor { +func NewDockerVolumeRemoveExecutor(volumeName string, force bool) common.Executor { return func(ctx context.Context) error { cli, err := GetDockerClient(ctx) if err != nil { @@ -17,14 +18,14 @@ func NewDockerVolumeRemoveExecutor(volume string, force bool) common.Executor { } defer cli.Close() - list, err := cli.VolumeList(ctx, filters.NewArgs()) + list, err := cli.VolumeList(ctx, volume.ListOptions{Filters: filters.NewArgs()}) if err != nil { return err } for _, vol := range list.Volumes { - if vol.Name == volume { - return removeExecutor(volume, force)(ctx) + if vol.Name == volumeName { + return removeExecutor(volumeName, force)(ctx) } }