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

feat: build darwin amd64/arm64 Docker images (backport #200) #207

Merged
merged 5 commits into from
Jun 1, 2022

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented May 31, 2022

This is an automatic backport of pull request #200 done by Mergify.
Cherry-pick of 831fe5e has failed:

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

You are currently cherry-picking commit 831fe5e.
  (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:   .gitignore
	modified:   go/darwin-arm64/Makefile
	modified:   go/darwin/Makefile

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go/darwin-arm64/Dockerfile.tmpl
	both modified:   go/darwin/Dockerfile.tmpl

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

* feat: buid darwing amd64/arm64 Docker images

* Update go/darwin-arm64/Makefile

* Update go/darwin/Makefile

* fix: typo

* feat: build multiarch Docker image

* fix: use production Docker images

* fix: typo

* fix: copy changes to darwinw-arm64

* fix: remove arg

(cherry picked from commit 831fe5e)

# Conflicts:
#	go/darwin-arm64/Dockerfile.tmpl
#	go/darwin/Dockerfile.tmpl
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label May 31, 2022
@elasticmachine
Copy link

elasticmachine commented May 31, 2022

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2022-06-01T09:19:38.268+0000

  • Duration: 44 min 27 sec

🤖 GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

@kuisathaverat kuisathaverat removed the conflicts There is a conflict in the backported pull request label May 31, 2022
@kuisathaverat kuisathaverat self-assigned this May 31, 2022
@kuisathaverat kuisathaverat added enhancement New feature or request Team:Automation Label for the Observability productivity team labels May 31, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request Team:Automation Label for the Observability productivity team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants