Skip to content

Bump alpine to 3.23, add platforms to docker-dryrun#36379

Merged
silverwind merged 16 commits intogo-gitea:mainfrom
silverwind:alpine323-2
Feb 1, 2026
Merged

Bump alpine to 3.23, add platforms to docker-dryrun#36379
silverwind merged 16 commits intogo-gitea:mainfrom
silverwind:alpine323-2

Conversation

@silverwind
Copy link
Copy Markdown
Member

@silverwind silverwind commented Jan 15, 2026

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jan 15, 2026
@silverwind silverwind marked this pull request as draft January 15, 2026 08:41
@silverwind
Copy link
Copy Markdown
Member Author

silverwind commented Jan 24, 2026

I've now added the platforms to docker-dryun, same es in the release build, so these two docker builds should now do the exact same builds.

- name: build regular docker image
uses: docker/build-push-action@v6
with:
context: .
platforms: linux/amd64,linux/arm64,linux/riscv64
push: true
tags: ${{ steps.meta.outputs.tags }}
annotations: ${{ steps.meta.outputs.annotations }}

@silverwind silverwind marked this pull request as ready for review January 24, 2026 13:33
@silverwind silverwind changed the title Bump alpine to 3.23 Bump alpine to 3.23, add platforms to docker-dryrun Jan 24, 2026
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Jan 24, 2026
@silverwind
Copy link
Copy Markdown
Member Author

silverwind commented Jan 24, 2026

BTW docker-dryrun is quite slow after this change (99minutes), but it's definitely necessary.

I think I can refactor the actions code that it only runs when Dockerfiles are modified, keeping the slowness impact to a minimum.

@silverwind
Copy link
Copy Markdown
Member Author

Did a small tweak so that pull-docker-dryrun does not trigger for any actions file modified, only for itself or the release ones.

I think ideally we remove pull-docker-dryrun and alter the release pipelines to do everything except pushing any files, but that's something for another time.

Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

This PR bumps the Alpine Linux version from 3.22 to 3.23 in the Dockerfiles and enhances the docker-dryrun CI workflow to build for multiple platforms (amd64, arm64, riscv64). This is a retry of previous attempts (#36185, #36202) that failed due to riscv64 build issues. The goal is to catch such platform-specific failures during PR validation rather than in the main branch.

Changes:

  • Updated Alpine base images from 3.22 to 3.23 in both Dockerfile and Dockerfile.rootless
  • Added multi-platform builds (linux/amd64, linux/arm64, linux/riscv64) to docker-dryrun workflow
  • Updated files-changed workflow to trigger docker builds when docker-related workflow files change

Reviewed changes

Copilot reviewed 4 out of 4 changed files in this pull request and generated 1 comment.

File Description
Dockerfile Bumped golang builder and runtime images to alpine3.23
Dockerfile.rootless Bumped golang builder and runtime images to alpine3.23
.github/workflows/pull-docker-dryrun.yml Added multi-platform builds and refined trigger conditions
.github/workflows/files-changed.yml Added docker-related workflow files to docker filter

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@silverwind
Copy link
Copy Markdown
Member Author

@techknowlogick care to review?

@techknowlogick techknowlogick enabled auto-merge (squash) January 31, 2026 15:03
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Feb 1, 2026
@techknowlogick techknowlogick added this pull request to the merge queue Feb 1, 2026
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to Branch Protection failures Feb 1, 2026
You're not authorized to push to this branch. Visit "About protected branches" for more information.
Signed-off-by: silverwind <me@silverwind.io>
Signed-off-by: silverwind <me@silverwind.io>
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Feb 1, 2026
@silverwind silverwind enabled auto-merge (squash) February 1, 2026 09:08
@silverwind silverwind merged commit 9d96039 into go-gitea:main Feb 1, 2026
23 of 24 checks passed
@GiteaBot GiteaBot added this to the 1.26.0 milestone Feb 1, 2026
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Feb 1, 2026
@silverwind silverwind deleted the alpine323-2 branch February 1, 2026 10:31
silverwind added a commit to silverwind/gitea that referenced this pull request Feb 1, 2026
* origin/main:
  Fix incorrect vendored detections (go-gitea#36508)
  Bump alpine to 3.23, add platforms to `docker-dryrun` (go-gitea#36379)
  Unify repo names in system notices (go-gitea#36491)
  Allow scroll propagation outside code editor (go-gitea#36502)
  Refactor ActionsTaskID (go-gitea#36503)
  Update JS deps, remove `knip`, misc tweaks (go-gitea#36499)
  [skip ci] Updated translations via Crowdin
  Fix editorconfig not respected in PR Conversation view (go-gitea#36492)
  Add FOLDER_ICON_THEME configuration option (go-gitea#36496)
  Don't create self-references in merged PRs (go-gitea#36490)
  Use reserved .test TLD for unit tests (go-gitea#36498)
  Fix bug when list pull request commits (go-gitea#36485)
  Update some go dependencies (go-gitea#36489)
  chore: add comments for "api/healthz", clean up test env (go-gitea#36481)
zjjhot added a commit to zjjhot/gitea that referenced this pull request Feb 2, 2026
* giteaofficial/main: (26 commits)
  [skip ci] Updated translations via Crowdin
  Remove and forbid `@ts-expect-error` (go-gitea#36513)
  Add resolve/unresolve review comment API endpoints (go-gitea#36441)
  Fix incorrect vendored detections (go-gitea#36508)
  Bump alpine to 3.23, add platforms to `docker-dryrun` (go-gitea#36379)
  Unify repo names in system notices (go-gitea#36491)
  Allow scroll propagation outside code editor (go-gitea#36502)
  Refactor ActionsTaskID (go-gitea#36503)
  Update JS deps, remove `knip`, misc tweaks (go-gitea#36499)
  [skip ci] Updated translations via Crowdin
  Fix editorconfig not respected in PR Conversation view (go-gitea#36492)
  Add FOLDER_ICON_THEME configuration option (go-gitea#36496)
  Don't create self-references in merged PRs (go-gitea#36490)
  Use reserved .test TLD for unit tests (go-gitea#36498)
  Fix bug when list pull request commits (go-gitea#36485)
  Update some go dependencies (go-gitea#36489)
  chore: add comments for "api/healthz", clean up test env (go-gitea#36481)
  [SECURITY] Toolchain Update to Go 1.25.6 (go-gitea#36480)
  [skip ci] Updated translations via Crowdin
  Render merged pull request title as such in dashboard feed (go-gitea#36479)
  ...
silverwind added a commit to silverwind/gitea that referenced this pull request Feb 4, 2026
* origin/main: (1246 commits)
  fix(packages/container): data race when uploading container blobs concurrently (go-gitea#36524)
  [skip ci] Updated translations via Crowdin
  Remove and forbid `@ts-expect-error` (go-gitea#36513)
  Add resolve/unresolve review comment API endpoints (go-gitea#36441)
  Fix incorrect vendored detections (go-gitea#36508)
  Bump alpine to 3.23, add platforms to `docker-dryrun` (go-gitea#36379)
  Unify repo names in system notices (go-gitea#36491)
  Allow scroll propagation outside code editor (go-gitea#36502)
  Refactor ActionsTaskID (go-gitea#36503)
  Update JS deps, remove `knip`, misc tweaks (go-gitea#36499)
  [skip ci] Updated translations via Crowdin
  Fix editorconfig not respected in PR Conversation view (go-gitea#36492)
  Add FOLDER_ICON_THEME configuration option (go-gitea#36496)
  Don't create self-references in merged PRs (go-gitea#36490)
  Use reserved .test TLD for unit tests (go-gitea#36498)
  Fix bug when list pull request commits (go-gitea#36485)
  Update some go dependencies (go-gitea#36489)
  chore: add comments for "api/healthz", clean up test env (go-gitea#36481)
  [SECURITY] Toolchain Update to Go 1.25.6 (go-gitea#36480)
  [skip ci] Updated translations via Crowdin
  ...

# Conflicts:
#	modules/templates/helper.go
#	options/locale/locale_en-US.ini
#	routers/web/repo/cherry_pick.go
#	routers/web/repo/editor.go
#	routers/web/repo/patch.go
#	templates/repo/editor/edit.tmpl
#	web_src/js/features/codeeditor.ts
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/internal

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants