From b680dfaa197bfde85328575bc52f2680c7f5cdf9 Mon Sep 17 00:00:00 2001 From: Tom Neuber Date: Thu, 3 Apr 2025 19:00:25 +0200 Subject: [PATCH 1/2] chore(ci): add own registry to buildx config --- .woodpecker/.build.yaml | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/.woodpecker/.build.yaml b/.woodpecker/.build.yaml index 36859f3..e8d24be 100644 --- a/.woodpecker/.build.yaml +++ b/.woodpecker/.build.yaml @@ -1,12 +1,25 @@ +variables: + - publish_mirror: &publish_mirror + from_secret: DOCKER_MIRROR_URL + - publish_logins: &publish_logins + - registry: + from_secret: DOCKER_MIRROR_URL + username: + from_secret: DOCKER_MIRROR_USER + password: + from_secret: DOCKER_MIRROR_PASS + - registry: git.ar21.de + username: + from_secret: REGISTRY_USER + password: + from_secret: REGISTRY_PASS + steps: - name: docker image: woodpeckerci/plugin-docker-buildx settings: - registry: git.ar21.de - username: - from_secret: REGISTRY_USER - password: - from_secret: REGISTRY_PASS + mirror: *publish_mirror + logins: *publish_logins repo: git.ar21.de/yolokube/country-geo-locations platforms: - linux/amd64 @@ -20,11 +33,8 @@ steps: - name: docker-staging image: woodpeckerci/plugin-docker-buildx settings: - registry: git.ar21.de - username: - from_secret: REGISTRY_USER - password: - from_secret: REGISTRY_PASS + mirror: *publish_mirror + logins: *publish_logins repo: git.ar21.de/yolokube/country-geo-locations platforms: - linux/amd64 From 561b21150ae966cd553585dfd233e589b7243b35 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 3 Apr 2025 17:06:56 +0000 Subject: [PATCH 2/2] chore(deps): update golang docker tag to v1.24.2 --- .woodpecker/.lint.yaml | 4 ++-- .woodpecker/.test.yaml | 2 +- Dockerfile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.woodpecker/.lint.yaml b/.woodpecker/.lint.yaml index c88368f..91a6ee0 100644 --- a/.woodpecker/.lint.yaml +++ b/.woodpecker/.lint.yaml @@ -1,12 +1,12 @@ steps: - name: gofmt - image: golang:1.24.1 + image: golang:1.24.2 commands: - gofmt -l -s . when: - event: push - name: vuln-check - image: golang:1.24.1 + image: golang:1.24.2 commands: - go install golang.org/x/vuln/cmd/govulncheck@latest - govulncheck ./... diff --git a/.woodpecker/.test.yaml b/.woodpecker/.test.yaml index e8bb521..7542ec3 100644 --- a/.woodpecker/.test.yaml +++ b/.woodpecker/.test.yaml @@ -1,6 +1,6 @@ steps: - name: gotest - image: golang:1.24.1 + image: golang:1.24.2 commands: - go test ./... when: diff --git a/Dockerfile b/Dockerfile index 2f4ce06..bf38d38 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.24.1-bookworm AS build +FROM golang:1.24.2-bookworm AS build # Create build workspace folder WORKDIR /workspace