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

Backport of security: update alpine base image to 3.20 into release/1.20.x #21774

Conversation

hc-github-team-consul-core
Copy link
Contributor

Backport

This PR is auto-generated from #21729 to be assessed for backporting due to the inclusion of the label backport/1.20.

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@zalimeni
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.

merge conflict error: POST https://api.github.com/repos/hashicorp/consul/merges: 409 Merge conflict []

The below text is copied from the body of the original PR.


Description

Fixes several CVEs by upgrading dependencies via base image upgrade.

Also drops all current triage exceptions for Docker containers, since this update knocks out the only active ones, and several more are already resolved.

Testing & Reproduction steps

Tested locally from one-off Docker CI build:

❯ scan container ./consul_default_linux_arm64_1.19.3-dev_c5ca319b156ce0bbb67d79eaa1bbc80113ae3557.docker.tar
✓ Scanned file:{path:"/Users/michael.zalimeni/workspace/security-scanner/consul_default_linux_arm64_1.19.3-dev_c5ca319b156ce0bbb67d79eaa1bbc80113ae3557.docker.tar"} in 59.8s - no results found

PR Checklist

  • updated test coverage
  • external facing docs updated
  • appropriate backport labels added
  • not a security concern

Overview of commits

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto approved Consul Bot automated PR

@sarahalsmiller sarahalsmiller force-pushed the backport/zalimeni/update-alpine-3.20/unduly-good-sheep branch from dbb29c5 to bc7d4f1 Compare September 19, 2024 20:43
@sarahalsmiller sarahalsmiller marked this pull request as ready for review September 19, 2024 20:43
@sarahalsmiller sarahalsmiller enabled auto-merge (squash) September 19, 2024 20:44
@sarahalsmiller sarahalsmiller merged commit 1f45e86 into release/1.20.x Sep 19, 2024
55 checks passed
@sarahalsmiller sarahalsmiller deleted the backport/zalimeni/update-alpine-3.20/unduly-good-sheep branch September 19, 2024 20:49
boruszak pushed a commit that referenced this pull request Oct 2, 2024
….20.x (#21774)

* backport of commit 4421ce1

* Upgrade ubi image to 9.4 (#21750)

---------

Co-authored-by: Michael Zalimeni <[email protected]>
Co-authored-by: Sarah Alsmiller <[email protected]>
Co-authored-by: sarahalsmiller <[email protected]>
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.

4 participants