mirror of
https://github.com/woodpecker-ci/woodpecker.git
synced 2025-02-24 07:06:19 +00:00
Merge branch 'origin/main' into 'next-release/main'
This commit is contained in:
commit
bc8e98fb75
10 changed files with 10 additions and 10 deletions
|
@ -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'
|
||||||
|
|
||||||
|
|
|
@ -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'
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -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'
|
||||||
|
|
|
@ -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 . .
|
||||||
|
|
|
@ -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 && \
|
||||||
|
|
|
@ -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 . .
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -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 && \
|
||||||
|
|
|
@ -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 && \
|
||||||
|
|
Loading…
Reference in a new issue