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

bake: ignore profiles in compose definitions #1903

Merged
merged 1 commit into from
Jun 26, 2023

Conversation

crazy-max
Copy link
Member

@crazy-max crazy-max commented Jun 22, 2023

fixes #1902

If a profile is being set in the compose file, build will not run against this service unless this profile is enabled: https://docs.docker.com/compose/compose-file/03-compose-file/#profiles

For compose it makes sense but bake doesn't have any support for profiles so I think we should just ignore them: https://github.com/compose-spec/compose-go/blob/532cd92682a3f00c22c1286f7eedccab2a232baa/types/project.go#L258

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
Copy link
Contributor

@milas milas left a comment

Choose a reason for hiding this comment

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

SGTM

Copy link
Contributor

@glours glours left a comment

Choose a reason for hiding this comment

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

LGTM

@crazy-max crazy-max merged commit 707dc43 into docker:master Jun 26, 2023
@crazy-max crazy-max deleted the fix-bake-compose-profiles branch June 26, 2023 13:03
woodpecker-bot pushed a commit to woodpecker-ci/plugin-docker-buildx that referenced this pull request Oct 17, 2023
This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [docker/buildx-bin](https://github.com/docker/buildx) | stage | patch | `0.11.0` -> `0.11.2` |

---

### Release Notes

<details>
<summary>docker/buildx (docker/buildx-bin)</summary>

### [`v0.11.2`](https://github.com/docker/buildx/releases/tag/v0.11.2)

[Compare Source](docker/buildx@v0.11.1...v0.11.2)

Welcome to the v0.11.2 release of buildx!

Please try out the release binaries and report any issues at https://github.com/docker/buildx/issues.

##### Contributors

-   [Justin Chadwell](https://github.com/jedevc)
-   [CrazyMax](https://github.com/crazy-max)
-   [Sebastiaan van Stijn](https://github.com/thaJeztah)

##### Changes

-   Fix a regression that caused buildx to not read the `KUBECONFIG` path from the instance store [#&#8203;1941](docker/buildx#1941)
-   Fix a regression with result handle builds showing up in the build history incorrectly [#&#8203;1954](docker/buildx#1954)

##### Dependency Changes

-   **github.com/docker/docker**          v24.0.2 -> [`36e9e79`](docker/buildx@36e9e796c6fc)
-   **github.com/moby/buildkit**          [`67a0862`](docker/buildx@67a08623b95a) -> [`faa0cc7`](docker/buildx@faa0cc7da353)
-   **github.com/tonistiigi/fsutil**      [`9e7a6df`](docker/buildx@9e7a6df48576) -> [`36ef4d8`](docker/buildx@36ef4d8c0dbb)
-   **github.com/xeipuuv/gojsonpointer**  [`4e3ac27`](docker/buildx@4e3ac2762d5f) -> [`02993c4`](docker/buildx@02993c407bfb)

Previous release can be found at [v0.11.1](https://github.com/docker/buildx/releases/tag/v0.11.1)

### [`v0.11.1`](https://github.com/docker/buildx/releases/tag/v0.11.1)

[Compare Source](docker/buildx@v0.11.0...v0.11.1)

Welcome to the v0.11.1 release of buildx!

Please try out the release binaries and report any issues at https://github.com/docker/buildx/issues.

##### Contributors

-   [CrazyMax](https://github.com/crazy-max)
-   [Justin Chadwell](https://github.com/jedevc)
-   [David Karlsson](https://github.com/dvdksn)
-   [Jhan S. Álvarez](https://github.com/yastanotheruser)

##### Changes

-   Fix a regression for bake where services in profiles would not be loaded. [#&#8203;1903](docker/buildx#1903)

-   Fix a regression where `--cgroup-parent` option had no effect during build. [#&#8203;1913](docker/buildx#1913)

-   Fix a regression where valid docker contexts could fail buildx builder name validation. [#&#8203;1879](docker/buildx#1879)

-   Fix an issue where the `host-gateway` special address could not be used as an argument to `--add-host`. [#&#8203;1894](docker/buildx#1894) (also requires moby/moby#45767)

-   Fix a possible panic when terminal is resized during the build. [#&#8203;1929](docker/buildx#1929)

##### Dependency Changes

-   **github.com/docker/cli-docs-tool**  v0.5.1 -> v0.6.0

Previous release can be found at [v0.11.0](https://github.com/docker/buildx/releases/tag/v0.11.0)

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Enabled.

��� **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4yMy4wIiwidXBkYXRlZEluVmVyIjoiMzcuMjQuMCIsInRhcmdldEJyYW5jaCI6Im1haW4ifQ==-->

Reviewed-on: https://codeberg.org/woodpecker-plugins/docker-buildx/pulls/85
Co-authored-by: Patrick Schratz <pat-s@mailbox.org>
Co-committed-by: Patrick Schratz <pat-s@mailbox.org>
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.

v0.11.x breaking with docker compose profiles
4 participants