diff --git a/.woodpecker/build-image.yml b/.woodpecker/build-image.yml index 859f53a..c28d7ae 100644 --- a/.woodpecker/build-image.yml +++ b/.woodpecker/build-image.yml @@ -5,13 +5,21 @@ when: steps: - name: build-and-push-image image: harbor.maximumdirect.net/proxy-dockerhub/woodpeckerci/plugin-kaniko + environment: + GITEA_USER: + from_secret: GITEA_USER + GITEA_TOKEN: + from_secret: GITEA_TOKEN settings: registry: harbor.maximumdirect.net repo: build/weatherapi auto_tag: true + build_args_from_env: + - GITEA_USER + - GITEA_TOKEN username: from_secret: HARBOR_ROBOT_USER password: from_secret: HARBOR_ROBOT_TOKEN cache: true - cache_repo: build-cache/weatherapi \ No newline at end of file + cache_repo: build-cache/weatherapi diff --git a/Dockerfile b/Dockerfile index d75358c..02d64d2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,8 @@ # syntax=docker/dockerfile:1.6 ARG GO_VERSION=1.25 +ARG GITEA_USER +ARG GITEA_TOKEN ############################ # Build stage @@ -8,6 +10,8 @@ ARG GO_VERSION=1.25 FROM harbor.maximumdirect.net/proxy-dockerhub/golang:${GO_VERSION}-bookworm AS build WORKDIR /src +ARG GITEA_USER +ARG GITEA_TOKEN ENV GOPRIVATE=gitea.maximumdirect.net/ejr/* \ GONOSUMDB=gitea.maximumdirect.net/ejr/* @@ -19,7 +23,11 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ # Cache dependencies first COPY go.mod go.sum ./ RUN --mount=type=cache,target=/go/pkg/mod \ - go mod download && go mod verify + if [ -n "${GITEA_USER}" ] && [ -n "${GITEA_TOKEN}" ]; then \ + git config --global url."https://${GITEA_USER}:${GITEA_TOKEN}@gitea.maximumdirect.net/".insteadOf "https://gitea.maximumdirect.net/"; \ + fi && \ + go mod download && go mod verify && \ + rm -f /root/.gitconfig # Copy the rest of the source COPY . .