diff --git a/.woodpecker/binaries.yml b/.woodpecker/binaries.yml index 1ee6f87d1..39bec6ff9 100644 --- a/.woodpecker/binaries.yml +++ b/.woodpecker/binaries.yml @@ -22,7 +22,7 @@ pipeline: build-server: group: build - image: golang:1.16 + image: golang:1.18 commands: - make release-server when: @@ -38,7 +38,7 @@ pipeline: build-agent: group: build - image: golang:1.16 + image: golang:1.18 commands: - make release-agent when: @@ -54,7 +54,7 @@ pipeline: build-cli: group: build - image: golang:1.16 + image: golang:1.18 commands: - make release-cli when: @@ -70,7 +70,7 @@ pipeline: build-deb-rpm: group: bundle - image: golang:1.16 + image: golang:1.18 commands: - make bundle when: @@ -85,7 +85,7 @@ pipeline: - "web/**" checksums: - image: golang:1.16 + image: golang:1.18 commands: - make release-checksums when: @@ -102,7 +102,7 @@ pipeline: # TODO: upload build artifacts for pushes to ${CI_REPO_DEFAULT_BRANCH} release-dryrun: - image: golang:1.16 + image: golang:1.18 commands: - ls -la dist/*.* - cat dist/checksums.txt diff --git a/.woodpecker/docker.yml b/.woodpecker/docker.yml index 2be3e28dd..3da97bd10 100644 --- a/.woodpecker/docker.yml +++ b/.woodpecker/docker.yml @@ -14,7 +14,7 @@ pipeline: - yarn build cross-compile-server: - image: techknowlogick/xgo:go-1.17.x + image: techknowlogick/xgo:go-1.18.x commands: - apt update - apt install -y tree @@ -22,6 +22,7 @@ pipeline: environment: PLATFORMS: linux|arm/v7;linux|arm64/v8;linux|amd64;linux|ppc64le TAGS: bindata sqlite sqlite_unlock_notify + XGO_VERSION: go-1.18.x publish-server-dryrun: image: woodpeckerci/plugin-docker-buildx diff --git a/Makefile b/Makefile index 1a31f5d92..016d2e070 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ CGO_CFLAGS ?= HAS_GO = $(shell hash go > /dev/null 2>&1 && echo "GO" || echo "NOGO" ) ifeq ($(HAS_GO), GO) - XGO_VERSION ?= go-1.17.x + XGO_VERSION ?= go-1.18.x CGO_CFLAGS ?= $(shell $(GO) env CGO_CFLAGS) endif diff --git a/docker/Dockerfile.agent.alpine.multiarch b/docker/Dockerfile.agent.alpine.multiarch index 90d3c9ddd..7ae148714 100644 --- a/docker/Dockerfile.agent.alpine.multiarch +++ b/docker/Dockerfile.agent.alpine.multiarch @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM golang:1.16 AS build +FROM --platform=$BUILDPLATFORM golang:1.18 AS build WORKDIR /src COPY . . @@ -7,7 +7,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \ --mount=type=cache,target=/go/pkg \ make build-agent -FROM alpine:3.14 +FROM alpine:3.16 RUN apk add -U --no-cache ca-certificates ENV GODEBUG=netdns=go EXPOSE 3000 diff --git a/docker/Dockerfile.agent.multiarch b/docker/Dockerfile.agent.multiarch index 00b0576f6..2be2d12eb 100644 --- a/docker/Dockerfile.agent.multiarch +++ b/docker/Dockerfile.agent.multiarch @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM golang:1.16 AS build +FROM --platform=$BUILDPLATFORM golang:1.18 AS build WORKDIR /src COPY . . @@ -11,7 +11,7 @@ FROM scratch ENV GODEBUG=netdns=go EXPOSE 3000 -# copy certs from golang:1.16 image +# copy certs from golang:1.18 image COPY --from=build /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt # copy agent binary COPY --from=build /src/dist/woodpecker-agent /bin/ diff --git a/docker/Dockerfile.cli.alpine.multiarch b/docker/Dockerfile.cli.alpine.multiarch index 97994aeb4..d96121064 100644 --- a/docker/Dockerfile.cli.alpine.multiarch +++ b/docker/Dockerfile.cli.alpine.multiarch @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM golang:1.16 AS build +FROM --platform=$BUILDPLATFORM golang:1.18 AS build WORKDIR /src COPY . . @@ -7,7 +7,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \ --mount=type=cache,target=/go/pkg \ make build-cli -FROM alpine:3.14 +FROM alpine:3.16 RUN apk add -U --no-cache ca-certificates ENV GODEBUG=netdns=go diff --git a/docker/Dockerfile.cli.multiarch b/docker/Dockerfile.cli.multiarch index 35bbba057..f706c5ee7 100644 --- a/docker/Dockerfile.cli.multiarch +++ b/docker/Dockerfile.cli.multiarch @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM golang:1.16 AS build +FROM --platform=$BUILDPLATFORM golang:1.18 AS build WORKDIR /src COPY . . @@ -10,7 +10,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \ FROM scratch ENV GODEBUG=netdns=go -# copy certs from golang:1.16 image +# copy certs from golang:1.18 image COPY --from=build /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt # copy cli binary COPY --from=build /src/dist/woodpecker-cli /bin/ diff --git a/docker/Dockerfile.make b/docker/Dockerfile.make index 861d1bf8c..b6a5f2cb9 100644 --- a/docker/Dockerfile.make +++ b/docker/Dockerfile.make @@ -1,5 +1,5 @@ # docker build --rm -f docker/Dockerfile.server -t woodpeckerci/woodpecker-server . -FROM golang:1.16-alpine as golang_image +FROM golang:1.18-alpine as golang_image FROM node:16-alpine RUN apk add make gcc musl-dev diff --git a/docker/Dockerfile.server.alpine.multiarch b/docker/Dockerfile.server.alpine.multiarch index 9f1a3fe4c..7b3bc9dd4 100644 --- a/docker/Dockerfile.server.alpine.multiarch +++ b/docker/Dockerfile.server.alpine.multiarch @@ -1,4 +1,5 @@ -FROM alpine:3.14 +FROM alpine:3.16 + ARG TARGETOS TARGETARCH RUN apk add -U --no-cache ca-certificates ENV GODEBUG=netdns=go diff --git a/docker/Dockerfile.server.multiarch b/docker/Dockerfile.server.multiarch index b5e8112b8..e7dc5c404 100644 --- a/docker/Dockerfile.server.multiarch +++ b/docker/Dockerfile.server.multiarch @@ -1,4 +1,4 @@ -FROM golang:1.16 AS certs +FROM golang:1.18 AS certs FROM scratch ARG TARGETOS TARGETARCH @@ -8,7 +8,7 @@ ENV WOODPECKER_DATABASE_DRIVER=sqlite3 ENV XDG_CACHE_HOME=/var/lib/woodpecker EXPOSE 8000 9000 80 443 -# copy certs from golang:1.16 image +# copy certs from golang:1.18 image COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt # copy server binary COPY dist/server/${TARGETOS}/${TARGETARCH}/woodpecker-server /bin/