Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test: bump docker API to 1.45 #6914

Merged
merged 4 commits into from
Jun 13, 2024

Conversation

DmitriyLewen
Copy link
Contributor

@DmitriyLewen DmitriyLewen commented Jun 13, 2024

Description

Docker removed Container and ContainerConfig field in API 1.45 - https://github.com/docker/cli/blob/v26.1.3/docs/deprecated.md#container-and-containerconfig-fields-in-image-inspect
After that TestDockerEngine is broken:
https://github.com/aquasecurity/trivy/actions/runs/9492961121/job/26160939888?pr=6908#step:5:1742
https://github.com/aquasecurity/trivy/actions/runs/9491332772/job/26160912201?pr=6913

This PR:

  • overwrite Container fields for TestDockerEngine (go-containerregistry still uses this field, so we can't just remove Container field from golden files)
  • update https://github.com/aquasecurity/testdocker (see chore(deps): use docker api 1.45 testdocker#17) and update relasted unit tests

Related PRs

Checklist

  • I've read the guidelines for contributing to this repository.
  • I've followed the conventions in the PR title.
  • I've added tests that prove my fix is effective or that my feature works.
  • I've updated the documentation with the relevant information (if needed).
  • I've added usage information (if the PR introduces new options)
  • I've included a "before" and "after" example to the description (if the PR is a user interface change).

@DmitriyLewen DmitriyLewen self-assigned this Jun 13, 2024
@DmitriyLewen DmitriyLewen changed the title Test: bump docker API to 1.45 test: bump docker API to 1.45 Jun 13, 2024
@DmitriyLewen DmitriyLewen marked this pull request as ready for review June 13, 2024 06:40
@DmitriyLewen DmitriyLewen requested a review from knqyf263 as a code owner June 13, 2024 06:40
@DmitriyLewen DmitriyLewen marked this pull request as draft June 13, 2024 06:40
@knqyf263
Copy link
Collaborator

LGTM. After you replace back go.mod, I'll approve it.

@DmitriyLewen DmitriyLewen marked this pull request as ready for review June 13, 2024 07:13
@knqyf263 knqyf263 enabled auto-merge June 13, 2024 07:22
@knqyf263 knqyf263 added this pull request to the merge queue Jun 13, 2024
Merged via the queue into aquasecurity:main with commit baa1216 Jun 13, 2024
12 checks passed
@DmitriyLewen DmitriyLewen deleted the test-fix/TestDockerEngine branch June 13, 2024 08:00
@DmitriyLewen
Copy link
Contributor Author

@aqua-bot backport release/v0.52

@aqua-bot
Copy link
Contributor

Backport PR created: #6922

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants