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.

Sign up for GitHub

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

Jump to bottom

feat(misconf): enabled China configuration for ACRs #7156

Merged
merged 3 commits into from
Jul 16, 2024
Merged

feat(misconf): enabled China configuration for ACRs #7156

merged 3 commits into from
Jul 16, 2024

Conversation

admanb
Copy link
Contributor

@admanb admanb commented Jul 12, 2024 •
edited
Loading

Description

Added configuration to support ACRs in the Azure China Cloud

Related issues

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).

@admanb admanb changed the title (feat)misconf: enabled China configuration for ACRs featr(misconf): enabled China configuration for ACRs Jul 12, 2024
@admanb admanb changed the title featr(misconf): enabled China configuration for ACRs feat(misconf): enabled China configuration for ACRs Jul 12, 2024
@knqyf263
Copy link
Collaborator

LGTM. Does it work in your environment?

@admanb
Copy link
Contributor Author

admanb commented Jul 15, 2024

LGTM. Does it work in your environment?

it does. I was able to successfully run against both .io and .cn registries with the correct permissions.

@knqyf263 knqyf263 added this pull request to the merge queue Jul 16, 2024
Merged via the queue into aquasecurity:main with commit d1ec89d Jul 16, 2024
14 of 15 checks passed
@aqua-bot aqua-bot mentioned this pull request Jul 16, 2024
Merged
skahn007gl pushed a commit to skahn007gl/trivy that referenced this pull request Jul 23, 2024
@admanb @skahn007gl
feat(misconf): enabled China configuration for ACRs (aquasecurity#7156)
40c2a0a
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@knqyf263 knqyf263 knqyf263 approved these changes

@DmitriyLewen DmitriyLewen Awaiting requested review from DmitriyLewen DmitriyLewen is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@admanb @knqyf263