sdgoij/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-03-17 14:24:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Optimize Docker build with dependency layer caching (#36864)

Browse Source 
1. Copy dependency manifests before the full source copy so that
dependency installation gets its own cached layer. When only source code
changes, the dependency layers are reused.
2. Remove the `GOPROXY=direct` override which was bypassing the Go
module proxy, causing build failures when git servers are unreachable.
The Go default (`https://proxy.golang.org,direct`) is now used instead.

---------

Co-authored-by: Claude (Opus 4.6) <noreply@anthropic.com>
This commit is contained in:
silverwind
2026-03-08 16:58:21 +01:00
committed by GitHub
parent 6f8ab6aaaf
commit 23a5bc5e64
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Dockerfile
View File

@@ -3,14 +3,14 @@
FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.26-alpine3.23 AS frontend-build FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.26-alpine3.23 AS frontend-build
RUN apk --no-cache add build-base git nodejs pnpm RUN apk --no-cache add build-base git nodejs pnpm
WORKDIR /src WORKDIR /src
COPY package.json pnpm-lock.yaml .npmrc ./
RUN --mount=type=cache,target=/root/.local/share/pnpm/store pnpm install --frozen-lockfile
COPY --exclude=.git/ . . COPY --exclude=.git/ . .
RUN --mount=type=cache,target=/root/.local/share/pnpm/store make frontend RUN make frontend
# Build backend for each target platform # Build backend for each target platform
FROM docker.io/library/golang:1.26-alpine3.23 AS build-env FROM docker.io/library/golang:1.26-alpine3.23 AS build-env
ARG GOPROXY=direct
ARG GITEA_VERSION ARG GITEA_VERSION
ARG TAGS="sqlite sqlite_unlock_notify" ARG TAGS="sqlite sqlite_unlock_notify"
ENV TAGS="bindata timetzdata $TAGS" ENV TAGS="bindata timetzdata $TAGS"
@@ -22,14 +22,15 @@ RUN apk --no-cache add \
git git
WORKDIR ${GOPATH}/src/code.gitea.io/gitea WORKDIR ${GOPATH}/src/code.gitea.io/gitea
COPY go.mod go.sum ./
RUN go mod download
# Use COPY instead of bind mount as read-only one breaks makefile state tracking and read-write one needs binary to be moved as it's discarded. # Use COPY instead of bind mount as read-only one breaks makefile state tracking and read-write one needs binary to be moved as it's discarded.
# ".git" directory is mounted separately later only for version data extraction. # ".git" directory is mounted separately later only for version data extraction.
COPY --exclude=.git/ . . COPY --exclude=.git/ . .
COPY --from=frontend-build /src/public/assets public/assets COPY --from=frontend-build /src/public/assets public/assets
# Build gitea, .git mount is required for version data # Build gitea, .git mount is required for version data
RUN --mount=type=cache,target=/go/pkg/mod \ RUN --mount=type=cache,target="/root/.cache/go-build" \
--mount=type=cache,target="/root/.cache/go-build" \
--mount=type=bind,source=".git/",target=".git/" \ --mount=type=bind,source=".git/",target=".git/" \
make backend make backend

11
Dockerfile.rootless
View File

@@ -3,14 +3,14 @@
FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.26-alpine3.23 AS frontend-build FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.26-alpine3.23 AS frontend-build
RUN apk --no-cache add build-base git nodejs pnpm RUN apk --no-cache add build-base git nodejs pnpm
WORKDIR /src WORKDIR /src
COPY package.json pnpm-lock.yaml .npmrc ./
RUN --mount=type=cache,target=/root/.local/share/pnpm/store pnpm install --frozen-lockfile
COPY --exclude=.git/ . . COPY --exclude=.git/ . .
RUN --mount=type=cache,target=/root/.local/share/pnpm/store make frontend RUN make frontend
# Build backend for each target platform # Build backend for each target platform
FROM docker.io/library/golang:1.26-alpine3.23 AS build-env FROM docker.io/library/golang:1.26-alpine3.23 AS build-env
ARG GOPROXY=direct
ARG GITEA_VERSION ARG GITEA_VERSION
ARG TAGS="sqlite sqlite_unlock_notify" ARG TAGS="sqlite sqlite_unlock_notify"
ENV TAGS="bindata timetzdata $TAGS" ENV TAGS="bindata timetzdata $TAGS"
@@ -22,13 +22,14 @@ RUN apk --no-cache add \
git git
WORKDIR ${GOPATH}/src/code.gitea.io/gitea WORKDIR ${GOPATH}/src/code.gitea.io/gitea
COPY go.mod go.sum ./
RUN go mod download
# See the comments in Dockerfile # See the comments in Dockerfile
COPY --exclude=.git/ . . COPY --exclude=.git/ . .
COPY --from=frontend-build /src/public/assets public/assets COPY --from=frontend-build /src/public/assets public/assets
# Build gitea, .git mount is required for version data # Build gitea, .git mount is required for version data
RUN --mount=type=cache,target=/go/pkg/mod \ RUN --mount=type=cache,target="/root/.cache/go-build" \
--mount=type=cache,target="/root/.cache/go-build" \
--mount=type=bind,source=".git/",target=".git/" \ --mount=type=bind,source=".git/",target=".git/" \
make backend make backend