Skip to content

[build] Only use buildx if cross compiling#128560

Merged
jbudz merged 6 commits intoelastic:mainfrom
jbudz:fix/docker-cross-compile
Apr 7, 2022
Merged

[build] Only use buildx if cross compiling#128560
jbudz merged 6 commits intoelastic:mainfrom
jbudz:fix/docker-cross-compile

Conversation

@jbudz
Copy link
Copy Markdown
Contributor

@jbudz jbudz commented Mar 25, 2022

#128272 wrongly assumed that docker buildx is available for all docker installs. This reverts back to the old behavior of using docker build when not cross compiling.

@jbudz jbudz added Team:Operations Kibana-Operations Team release_note:skip Skip the PR/issue when compiling release notes backport:skip This PR does not require backporting v8.2.0 ci:build-os-packages labels Mar 25, 2022
@jbudz jbudz marked this pull request as ready for review March 28, 2022 13:25
@jbudz jbudz requested a review from a team as a code owner March 28, 2022 13:25
@elasticmachine
Copy link
Copy Markdown
Contributor

Pinging @elastic/kibana-operations (Team:Operations)

@jbudz jbudz added v8.3.0 v7.17.3 auto-backport Deprecated - use backport:version if exact versions are needed and removed backport:skip This PR does not require backporting labels Apr 4, 2022
Copy link
Copy Markdown
Contributor

@mistic mistic left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Copy Markdown
Contributor

@rockdaboot rockdaboot left a comment

Choose a reason for hiding this comment

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

Succeeds for me (before: build failure) and LGTM.

@jbudz jbudz enabled auto-merge (squash) April 7, 2022 16:11
@jbudz jbudz merged commit bcdb0b2 into elastic:main Apr 7, 2022
@kibana-ci
Copy link
Copy Markdown

💚 Build Succeeded

Metrics [docs]

✅ unchanged

History

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

kibanamachine pushed a commit that referenced this pull request Apr 7, 2022
* [build] Only use buildx if cross compiling

* reuse variable

* fix conditional

(cherry picked from commit bcdb0b2)
@kibanamachine
Copy link
Copy Markdown
Contributor

💔 Some backports could not be created

Status Branch Result
8.2
7.17 Backport failed because of merge conflicts

You might need to backport the following PRs to 7.17:
- [build] Cross compile docker images (#128272)
- [ci] Verify docker contexts (#122897)

Manual backport

To create the backport manually run:

node scripts/backport --pr 128560

Note: Successful backport PRs will be merged automatically after passing CI.

Questions ?

Please refer to the Backport tool documentation

jbudz added a commit to jbudz/kibana that referenced this pull request Apr 7, 2022
* [build] Only use buildx if cross compiling

* reuse variable

* fix conditional
mitodrummer pushed a commit to mitodrummer/kibana that referenced this pull request Apr 7, 2022
* [build] Only use buildx if cross compiling

* reuse variable

* fix conditional

fix jump to nested entity_id. also defaulting verbose mode to OFF
kibanamachine added a commit that referenced this pull request Apr 7, 2022
* [build] Only use buildx if cross compiling

* reuse variable

* fix conditional

(cherry picked from commit bcdb0b2)

Co-authored-by: Jonathan Budzenski <jon@elastic.co>
jbudz added a commit that referenced this pull request Apr 7, 2022
* [build] Only use buildx if cross compiling

* reuse variable

* fix conditional
@jbudz
Copy link
Copy Markdown
Contributor Author

jbudz commented Apr 7, 2022

7.17: fc6ea53

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

auto-backport Deprecated - use backport:version if exact versions are needed backported ci:build-os-packages release_note:skip Skip the PR/issue when compiling release notes Team:Operations Kibana-Operations Team v7.17.3 v8.2.0 v8.3.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants