Merge branch 'origin/main' into 'next-release/main'

This commit is contained in:
oauth 2025-02-15 06:52:34 +00:00
commit bc8e98fb75
10 changed files with 10 additions and 10 deletions

View file

@ -7,7 +7,7 @@ when:
- .woodpecker/binaries.yaml - .woodpecker/binaries.yaml
variables: variables:
- &golang_image 'docker.io/golang:1.23' - &golang_image 'docker.io/golang:1.24'
- &node_image 'docker.io/node:23-alpine' - &node_image 'docker.io/node:23-alpine'
- &xgo_image 'docker.io/techknowlogick/xgo:go-1.23.x' - &xgo_image 'docker.io/techknowlogick/xgo:go-1.23.x'

View file

@ -1,5 +1,5 @@
variables: variables:
- &golang_image 'docker.io/golang:1.23' - &golang_image 'docker.io/golang:1.24'
- &node_image 'docker.io/node:23-alpine' - &node_image 'docker.io/node:23-alpine'
- &xgo_image 'docker.io/techknowlogick/xgo:go-1.23.x' - &xgo_image 'docker.io/techknowlogick/xgo:go-1.23.x'
- &buildx_plugin 'docker.io/woodpeckerci/plugin-docker-buildx:5.2.1' - &buildx_plugin 'docker.io/woodpeckerci/plugin-docker-buildx:5.2.1'

View file

@ -1,5 +1,5 @@
variables: variables:
- &golang_image 'docker.io/golang:1.23' - &golang_image 'docker.io/golang:1.24'
- &node_image 'docker.io/node:23-alpine' - &node_image 'docker.io/node:23-alpine'
- &alpine_image 'docker.io/alpine:3.21' - &alpine_image 'docker.io/alpine:3.21'
- path: &when_path - path: &when_path

View file

@ -1,5 +1,5 @@
variables: variables:
- &golang_image 'docker.io/golang:1.23' - &golang_image 'docker.io/golang:1.24'
- &when - &when
- path: &when_path # related config files - path: &when_path # related config files
- '.woodpecker/test.yaml' - '.woodpecker/test.yaml'

View file

@ -1,4 +1,4 @@
FROM --platform=$BUILDPLATFORM docker.io/golang:1.23 AS build FROM --platform=$BUILDPLATFORM docker.io/golang:1.24 AS build
WORKDIR /src WORKDIR /src
COPY . . COPY . .

View file

@ -1,4 +1,4 @@
FROM --platform=$BUILDPLATFORM docker.io/golang:1.23 AS build FROM --platform=$BUILDPLATFORM docker.io/golang:1.24 AS build
RUN groupadd -g 1000 woodpecker && \ RUN groupadd -g 1000 woodpecker && \
useradd -u 1000 -g 1000 woodpecker && \ useradd -u 1000 -g 1000 woodpecker && \

View file

@ -1,4 +1,4 @@
FROM --platform=$BUILDPLATFORM docker.io/golang:1.23 AS build FROM --platform=$BUILDPLATFORM docker.io/golang:1.24 AS build
WORKDIR /src WORKDIR /src
COPY . . COPY . .

View file

@ -1,4 +1,4 @@
FROM --platform=$BUILDPLATFORM docker.io/golang:1.23 AS build FROM --platform=$BUILDPLATFORM docker.io/golang:1.24 AS build
RUN groupadd -g 1000 woodpecker && \ RUN groupadd -g 1000 woodpecker && \
useradd -u 1000 -g 1000 woodpecker useradd -u 1000 -g 1000 woodpecker

View file

@ -1,5 +1,5 @@
# docker build --rm -f docker/Dockerfile.make -t woodpecker/make:local . # docker build --rm -f docker/Dockerfile.make -t woodpecker/make:local .
FROM docker.io/golang:1.23-alpine AS golang_image FROM docker.io/golang:1.24-alpine AS golang_image
FROM docker.io/node:23-alpine FROM docker.io/node:23-alpine
RUN apk add --no-cache --update make gcc binutils-gold musl-dev protoc && \ RUN apk add --no-cache --update make gcc binutils-gold musl-dev protoc && \

View file

@ -1,4 +1,4 @@
FROM --platform=$BUILDPLATFORM docker.io/golang:1.23 AS build FROM --platform=$BUILDPLATFORM docker.io/golang:1.24 AS build
RUN groupadd -g 1000 woodpecker && \ RUN groupadd -g 1000 woodpecker && \
useradd -u 1000 -g 1000 woodpecker && \ useradd -u 1000 -g 1000 woodpecker && \