Skip to content

Backport of Dockerfile: remove gnupg from dev image into release/1.0.x#1887

Merged
david-yu merged 2 commits intorelease/1.0.xfrom
backport/dyu/dev-gnupg/adversely-apparent-tortoise
Feb 7, 2023
Merged

Backport of Dockerfile: remove gnupg from dev image into release/1.0.x#1887
david-yu merged 2 commits intorelease/1.0.xfrom
backport/dyu/dev-gnupg/adversely-apparent-tortoise

Conversation

@thisisnotashwin
Copy link
Copy Markdown
Contributor

Backport

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

WARNING automatic cherry-pick of commits failed. Commits will require human attention.

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

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


Changes proposed in this PR:

How I've tested this PR:

How I expect reviewers to test this PR:

Checklist:

  • Tests added
  • CHANGELOG entry added

    HashiCorp engineers only, community PRs should not add a changelog entry.
    Entries should use present tense (e.g. Add support for...)


Overview of commits

@david-yu david-yu marked this pull request as ready for review February 7, 2023 04:09
@david-yu david-yu merged commit 04ca2a5 into release/1.0.x Feb 7, 2023
@david-yu david-yu deleted the backport/dyu/dev-gnupg/adversely-apparent-tortoise branch February 7, 2023 06:07
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.

2 participants