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

Change: Use gvm-libs:oldstable images (backport #2012) #2021

Merged
merged 3 commits into from
Jun 26, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 26, 2023

This is an automatic backport of pull request #2012 done by Mergify.
Cherry-pick of 2707a7b has failed:

On branch mergify/bp/stable/pr-2012
Your branch is up to date with 'origin/stable'.

You are currently cherry-picking commit 2707a7baf.
  (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:   .docker/build.Dockerfile
	modified:   .github/workflows/build-container.yml
	modified:   .github/workflows/container.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .docker/prod.Dockerfile

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

The oldstable tag of gvm-libs is used for compatibility of the
debian package dependencies.

(cherry picked from commit 2707a7b)

# Conflicts:
#	.docker/prod.Dockerfile
@mergify mergify bot requested review from a team as code owners June 26, 2023 15:25
@mergify mergify bot added the conflicts This backport pull request has merge conflicts that need to be resolved label Jun 26, 2023
@github-actions
Copy link

Conventional Commits Report

Type Number
Changed 1

🚀 Conventional commits found.

@timopollmeier timopollmeier merged commit 59dd1fc into stable Jun 26, 2023
10 checks passed
@timopollmeier timopollmeier deleted the mergify/bp/stable/pr-2012 branch June 26, 2023 15:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts This backport pull request has merge conflicts that need to be resolved
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant