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

use distroless.dev/static base image (backport #1648) #1662

Merged
merged 5 commits into from
Oct 5, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 10, 2022

This is an automatic backport of pull request #1648 done by Mergify.
Cherry-pick of e011a10 has failed:

On branch mergify/bp/release/v7.0.x/pr-1648
Your branch is up to date with 'origin/release/v7.0.x'.

You are currently cherry-picking commit e011a10.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   Makefile
	modified:   e2e.Dockerfile
	modified:   tests/e2e/e2e_setup_test.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   Dockerfile
	both modified:   tests/e2e/e2e_test.go
	both modified:   tests/e2e/e2e_util_test.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* closes #1621

* run hermes commands as root

(cherry picked from commit e011a10)

# Conflicts:
#	Dockerfile
#	tests/e2e/e2e_test.go
#	tests/e2e/e2e_util_test.go
@codecov
Copy link

codecov bot commented Aug 10, 2022

Codecov Report

❗ No coverage uploaded for pull request base (release/v7.0.x@231ae5e). Click here to learn what that means.
The diff coverage is n/a.

Additional details and impacted files
@@                Coverage Diff                @@
##             release/v7.0.x    #1662   +/-   ##
=================================================
  Coverage                  ?   15.77%           
=================================================
  Files                     ?       10           
  Lines                     ?     1363           
  Branches                  ?        0           
=================================================
  Hits                      ?      215           
  Misses                    ?     1137           
  Partials                  ?       11           

@mergify mergify bot requested review from mmulji-ic and glnro as code owners August 10, 2022 15:28
@mmulji-ic mmulji-ic marked this pull request as draft August 11, 2022 15:34
@mmulji-ic mmulji-ic self-assigned this Aug 12, 2022
@okwme okwme closed this Sep 14, 2022
@okwme okwme reopened this Sep 14, 2022
@mmulji-ic mmulji-ic marked this pull request as ready for review October 4, 2022 08:14
@mmulji-ic mmulji-ic merged commit 050e402 into release/v7.0.x Oct 5, 2022
@mmulji-ic mmulji-ic deleted the mergify/bp/release/v7.0.x/pr-1648 branch October 5, 2022 08:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants