Skip to content

Add support for alpine 3.22 and drop 3.18#301

Merged
agners merged 7 commits into
home-assistant:masterfrom
onedr0p:patch-1
Jun 10, 2025
Merged

Add support for alpine 3.22 and drop 3.18#301
agners merged 7 commits into
home-assistant:masterfrom
onedr0p:patch-1

Conversation

@onedr0p

@onedr0p onedr0p commented Jun 1, 2025

Copy link
Copy Markdown
Contributor

- Alpine 3.22 was release a few days ago.
alpinelinux.org/posts/Alpine-3.22.0-released.html
- Alpine 3.18 reached its EOL last month and is therefore dropped.

alpinelinux.org/releases
@onedr0p onedr0p marked this pull request as ready for review June 1, 2025 01:55
Comment thread .github/workflows/builder.yml Outdated
@home-assistant

home-assistant Bot commented Jun 5, 2025

Copy link
Copy Markdown

Please take a look at the requested changes, and use the Ready for review button when you are done, thanks 👍

Learn more about our pull request process.

@home-assistant home-assistant Bot marked this pull request as draft June 5, 2025 22:12
onedr0p and others added 2 commits June 5, 2025 20:56
Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com>
@onedr0p onedr0p marked this pull request as ready for review June 6, 2025 01:00
@home-assistant home-assistant Bot requested a review from cdce8p June 6, 2025 01:00
@cdce8p

cdce8p commented Jun 6, 2025

Copy link
Copy Markdown
Member

Thanks @onedr0p! Looking back at the PR history, it seems we might need to split this up into two separate PRs with a release in between. E.g.

@onedr0p

onedr0p commented Jun 6, 2025

Copy link
Copy Markdown
Contributor Author

No worries, that was my initial thought too. I'll make the changes in the morning.

@onedr0p

onedr0p commented Jun 6, 2025

Copy link
Copy Markdown
Contributor Author

@cdce8p I've updated the PR to only include the Alpine base image changes.

@cdce8p cdce8p left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM!

@cdce8p

cdce8p commented Jun 10, 2025

Copy link
Copy Markdown
Member

@onedr0p Any reason you merged the upstream branch here? The CI run was already green. A new build will take 4+ hours and a lot of runners. If you're able to, could you force-push remove the merge commit? Hopefully this would restore the CI status and this PR would be good to go.

@agners

agners commented Jun 10, 2025

Copy link
Copy Markdown
Member

@onedr0p Any reason you merged the upstream branch here? The CI run was already green. A new build will take 4+ hours and a lot of runners. If you're able to, could you force-push remove the merge commit? Hopefully this would restore the CI status and this PR would be good to go.

I did just that, but it seems it doesn't restore the CI status 🙈

Anyhow, this looked good before, so I'll go ahead and merge as is.

@agners agners left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM, thanks!

@agners agners merged commit 9c06473 into home-assistant:master Jun 10, 2025
88 checks passed
@onedr0p onedr0p deleted the patch-1 branch June 10, 2025 14:00
@onedr0p

onedr0p commented Jun 10, 2025

Copy link
Copy Markdown
Contributor Author

Apologies, I wasn't aware of the build times 😕 I'll go ahead and open PR to bump the Python base images soon.

@cdce8p

cdce8p commented Jun 10, 2025

Copy link
Copy Markdown
Member

I'll go ahead and open PR to bump the Python base images soon.

We'll need a new release first. Otherwise the Python build for alpine3.22 would just fail. Maybe after #303 is merged @agners?

@onedr0p

onedr0p commented Jun 10, 2025

Copy link
Copy Markdown
Contributor Author

I could stage the PR at least as a WIP while we wait then you can merge it when ready.

@agners

agners commented Jun 10, 2025

Copy link
Copy Markdown
Member

We'll need a new release first. Otherwise the Python build for alpine3.22 would just fail. Maybe after #303 is merged @agners?

Yeah make sense. Here we go: https://github.com/home-assistant/docker-base/releases/tag/2025.06.0.

@cdce8p

cdce8p commented Jun 10, 2025

Copy link
Copy Markdown
Member

Yeah make sense. Here we go: https://github.com/home-assistant/docker-base/releases/tag/2025.06.0.

Thanks! Looks like it needs some attention though. Restarting the failed jobs should do the trick. I don't have the permission for it unfortunately. https://github.com/home-assistant/docker-base/actions/runs/15563220512

@frenck

frenck commented Jun 10, 2025

Copy link
Copy Markdown
Member

Restarted

@onedr0p

onedr0p commented Jun 10, 2025

Copy link
Copy Markdown
Contributor Author

@frenck while you are here, according to the blog post should we be deprecating support for i386, armhf and armv7 here anytime soon? We could make use of the native GH arm64 runners if true.

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.

4 participants