From 9d960390274f3020c21a540ee9ddfa0e1371e9e9 Mon Sep 17 00:00:00 2001 From: silverwind Date: Sun, 1 Feb 2026 10:36:43 +0100 Subject: [PATCH] Bump alpine to 3.23, add platforms to `docker-dryrun` (#36379) - Bump alpine to 3.23 following https://github.com/go-gitea/gitea/pull/36185 and https://github.com/go-gitea/gitea/pull/36202. - Enable all architectures in `docker-dryrun`. - Tweak actions conditions to be more precise. --------- Signed-off-by: silverwind Co-authored-by: techknowlogick Co-authored-by: Giteabot --- .github/workflows/files-changed.yml | 1 + .github/workflows/pull-docker-dryrun.yml | 7 ++++--- Dockerfile | 4 ++-- Dockerfile.rootless | 4 ++-- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/files-changed.yml b/.github/workflows/files-changed.yml index 7b58186cd0..332e9e0d6f 100644 --- a/.github/workflows/files-changed.yml +++ b/.github/workflows/files-changed.yml @@ -85,6 +85,7 @@ jobs: - "uv.lock" docker: + - ".github/workflows/pull-docker-dryrun.yml" - "Dockerfile" - "Dockerfile.rootless" - "docker/**" diff --git a/.github/workflows/pull-docker-dryrun.yml b/.github/workflows/pull-docker-dryrun.yml index 2a4d675abc..405521c354 100644 --- a/.github/workflows/pull-docker-dryrun.yml +++ b/.github/workflows/pull-docker-dryrun.yml @@ -14,24 +14,25 @@ jobs: contents: read container: - if: needs.files-changed.outputs.docker == 'true' || needs.files-changed.outputs.actions == 'true' + if: needs.files-changed.outputs.docker == 'true' needs: files-changed runs-on: ubuntu-latest permissions: contents: read steps: - uses: actions/checkout@v6 + - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - name: Build regular container image uses: docker/build-push-action@v6 with: context: . + platforms: linux/amd64,linux/arm64,linux/riscv64 push: false - tags: gitea/gitea:linux-amd64 - name: Build rootless container image uses: docker/build-push-action@v6 with: context: . push: false + platforms: linux/amd64,linux/arm64,linux/riscv64 file: Dockerfile.rootless - tags: gitea/gitea:linux-amd64 diff --git a/Dockerfile b/Dockerfile index cb536b0bde..7893db73e8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 # Build stage -FROM docker.io/library/golang:1.25-alpine3.22 AS build-env +FROM docker.io/library/golang:1.25-alpine3.23 AS build-env ARG GOPROXY=direct @@ -39,7 +39,7 @@ RUN chmod 755 /tmp/local/usr/bin/entrypoint \ /tmp/local/etc/s6/.s6-svscan/* \ /go/src/code.gitea.io/gitea/gitea -FROM docker.io/library/alpine:3.22 AS gitea +FROM docker.io/library/alpine:3.23 AS gitea EXPOSE 22 3000 diff --git a/Dockerfile.rootless b/Dockerfile.rootless index e4ba3d2fba..6640c2b2de 100644 --- a/Dockerfile.rootless +++ b/Dockerfile.rootless @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 # Build stage -FROM docker.io/library/golang:1.25-alpine3.22 AS build-env +FROM docker.io/library/golang:1.25-alpine3.23 AS build-env ARG GOPROXY=direct @@ -33,7 +33,7 @@ COPY docker/rootless /tmp/local RUN chmod 755 /tmp/local/usr/local/bin/* \ /go/src/code.gitea.io/gitea/gitea -FROM docker.io/library/alpine:3.22 AS gitea-rootless +FROM docker.io/library/alpine:3.23 AS gitea-rootless EXPOSE 2222 3000