Skip to content

ci: re-use local source to build binary images #12471

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

Merged
merged 1 commit into from
Jan 15, 2025

Conversation

glours
Copy link
Contributor

@glours glours commented Jan 15, 2025

What I did
Fix merge CI workflow

Related issue

(not mandatory) A picture of a cute animal, if possible in relation to what you did

@glours glours requested review from crazy-max and ndeloof January 15, 2025 16:18
@glours glours self-assigned this Jan 15, 2025
@glours glours force-pushed the fix-merge-workflow-bake branch from 26acb6d to 1343501 Compare January 15, 2025 16:25
id: bake
with:
source: .
files: |
./docker-bake.hcl
cwd://${{ steps.meta.outputs.bake-file }}
Copy link
Member

@crazy-max crazy-max Jan 15, 2025

Choose a reason for hiding this comment

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

you can remove cwd:// prefix if local source is preferred

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done!

@glours glours force-pushed the fix-merge-workflow-bake branch from 1343501 to 79fdceb Compare January 15, 2025 16:29
@glours glours enabled auto-merge (rebase) January 15, 2025 16:30
@glours glours disabled auto-merge January 15, 2025 16:31
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
@glours glours force-pushed the fix-merge-workflow-bake branch from 79fdceb to e86981e Compare January 15, 2025 16:33
@glours glours enabled auto-merge (rebase) January 15, 2025 16:36
@glours glours merged commit 9be7a3c into docker:main Jan 15, 2025
24 checks passed
tmeijn pushed a commit to tmeijn/dotfiles that referenced this pull request Jan 26, 2025
This MR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [docker/compose](https://github.com/docker/compose) | patch | `v2.32.2` -> `v2.32.4` |

MR created with the help of [el-capitano/tools/renovate-bot](https://gitlab.com/el-capitano/tools/renovate-bot).

**Proposed changes to behavior should be submitted there as MRs.**

---

### Release Notes

<details>
<summary>docker/compose (docker/compose)</summary>

### [`v2.32.4`](https://github.com/docker/compose/releases/tag/v2.32.4)

[Compare Source](docker/compose@v2.32.3...v2.32.4)

#### What's Changed

This release fixes the version issue of `v2.32.3`

##### 🔧  Internal

-   ci: use local source for binary builds by [@&#8203;crazy-max](https://github.com/crazy-max) in docker/compose#12470
-   ci: re-use local source to build binary images by [@&#8203;glours](https://github.com/glours) in docker/compose#12471
-   add missing tag for build during merge workflow by [@&#8203;glours](https://github.com/glours) in docker/compose#12473

**Full Changelog**: docker/compose@v2.32.3...v2.32.4

### [`v2.32.3`](https://github.com/docker/compose/releases/tag/v2.32.3)

[Compare Source](docker/compose@v2.32.2...v2.32.3)

#### What's Changed

⚠️ This release don't display properly its version! Instead of displaying the tag the `docker compose version` display its commit hash.

##### 🐛 Fixes

-   Only override service mac if set on the main network. by [@&#8203;apollo13](https://github.com/apollo13) [(12439)](docker/compose#12439)
-   Exclude one-off container running convergence by [@&#8203;ndeloof](https://github.com/ndeloof) [(12441)](docker/compose#12441)
-   Can't render progress concurrently with buildkit by [@&#8203;ndeloof](https://github.com/ndeloof) [(12442)](docker/compose#12442)
-   Image can be set to a local ID, that isn't a valid docker ref by [@&#8203;ndeloof](https://github.com/ndeloof) [(12446)](docker/compose#12446)

##### 🔧  Internal

-   CI: update bake-action to v6 by [@&#8203;crazy-max](https://github.com/crazy-max) [(12452)](docker/compose#12452)
-   Simplification by [@&#8203;ndeloof](https://github.com/ndeloof) [(12451)](docker/compose#12451)

**Full Changelog**: docker/compose@v2.32.2...v2.32.3

</details>

---

### Configuration

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

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

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

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

---

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

---

This MR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOS4xMjIuMCIsInVwZGF0ZWRJblZlciI6IjM5LjEyMi4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJSZW5vdmF0ZSBCb3QiXX0=-->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
3 participants