Merge branch 'main' into fix-duplicated-service

woodpecker-ci · Feb 16, 2024 · 02db4d7 · 02db4d7
2 parents a2edd89 + 2a58078
commit 02db4d7
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/.woodpecker/binaries.yaml b/.woodpecker/binaries.yaml
@@ -2,9 +2,9 @@ when:
   event: tag
 
 variables:
-  - &golang_image 'docker.io/golang:1.21.6'
+  - &golang_image 'docker.io/golang:1.22.0'
   - &node_image 'docker.io/node:21-alpine'
-  - &xgo_image 'docker.io/techknowlogick/xgo:go-1.21.6'
+  - &xgo_image 'docker.io/techknowlogick/xgo:go-1.22.0'
   - &xgo_version 'go-1.21.2'
 
 steps:

diff --git a/.woodpecker/docker.yaml b/.woodpecker/docker.yaml
@@ -7,9 +7,9 @@ when:
       - renovate/*
 
 variables:
-  - &golang_image 'docker.io/golang:1.21.6'
+  - &golang_image 'docker.io/golang:1.22.0'
   - &node_image 'docker.io/node:21-alpine'
-  - &xgo_image 'docker.io/techknowlogick/xgo:go-1.21.6'
+  - &xgo_image 'docker.io/techknowlogick/xgo:go-1.22.0'
   - &xgo_version 'go-1.21.2'
   - &buildx_plugin 'docker.io/woodpeckerci/plugin-docker-buildx:3.1.0'
   - &platforms_release 'linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/386,linux/amd64,linux/ppc64le,linux/riscv64,linux/s390x,freebsd/arm64,freebsd/amd64,openbsd/arm64,openbsd/amd64'

diff --git a/docker/Dockerfile.agent.alpine.multiarch b/docker/Dockerfile.agent.alpine.multiarch
@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM docker.io/golang:1.21 AS build
+FROM --platform=$BUILDPLATFORM docker.io/golang:1.22 AS build
 
 WORKDIR /src
 COPY . .

diff --git a/docker/Dockerfile.agent.multiarch b/docker/Dockerfile.agent.multiarch
@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM docker.io/golang:1.21 AS build
+FROM --platform=$BUILDPLATFORM docker.io/golang:1.22 AS build
 
 WORKDIR /src
 COPY . .

diff --git a/docker/Dockerfile.cli.alpine.multiarch b/docker/Dockerfile.cli.alpine.multiarch
@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM docker.io/golang:1.21 AS build
+FROM --platform=$BUILDPLATFORM docker.io/golang:1.22 AS build
 
 WORKDIR /src
 COPY . .

diff --git a/docker/Dockerfile.cli.multiarch b/docker/Dockerfile.cli.multiarch
@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM docker.io/golang:1.21 AS build
+FROM --platform=$BUILDPLATFORM docker.io/golang:1.22 AS build
 
 WORKDIR /src
 COPY . .

diff --git a/docker/Dockerfile.make b/docker/Dockerfile.make
@@ -1,5 +1,5 @@
 # docker build --rm  -f docker/Dockerfile.make -t woodpecker/make:local .
-FROM docker.io/golang:1.21-alpine3.18 as golang_image
+FROM docker.io/golang:1.22-alpine3.18 as golang_image
 FROM docker.io/node:21-alpine3.18
 
 # renovate: datasource=repology depName=alpine_3_18/make versioning=loose

diff --git a/docker/Dockerfile.server.multiarch b/docker/Dockerfile.server.multiarch
@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM docker.io/golang:1.21 AS certs
+FROM --platform=$BUILDPLATFORM docker.io/golang:1.22 AS certs
 
 FROM scratch
 ARG TARGETOS TARGETARCH