From 6f434064256626c849511aab837b4d83564564dd Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Mon, 20 Mar 2023 21:55:16 +0100 Subject: [PATCH 1/5] Add full qualifier "docker.io" and use quay.io if possible --- .woodpecker/binaries.yml | 12 ++-- .woodpecker/docker.yml | 85 +++++++++++++---------- .woodpecker/docs.yml | 8 +-- .woodpecker/test.yml | 12 ++-- .woodpecker/web.yml | 2 +- docker/Dockerfile.agent.alpine.multiarch | 4 +- docker/Dockerfile.agent.multiarch | 2 +- docker/Dockerfile.cli.alpine.multiarch | 4 +- docker/Dockerfile.cli.multiarch | 2 +- docker/Dockerfile.make | 2 +- docker/Dockerfile.server.alpine.multiarch | 2 +- docker/Dockerfile.server.multiarch | 2 +- shared/constant/constant.go | 10 +-- 13 files changed, 77 insertions(+), 70 deletions(-) diff --git a/.woodpecker/binaries.yml b/.woodpecker/binaries.yml index 5d8e63ab46..32e90b0be0 100644 --- a/.woodpecker/binaries.yml +++ b/.woodpecker/binaries.yml @@ -2,14 +2,10 @@ depends_on: - test - web -# TODO: upload build artifacts for pushes to ${CI_REPO_DEFAULT_BRANCH} -when: - event: tag - variables: - - &golang_image 'golang:1.21.3' - - &node_image 'node:21-alpine' - - &xgo_image 'techknowlogick/xgo:go-1.21.3' + - &golang_image 'docker.io/golang:1.21.3' + - &node_image 'docker.io/node:21-alpine' + - &xgo_image 'docker.io/techknowlogick/xgo:go-1.21.3' - &xgo_version 'go-1.21.2' steps: @@ -72,7 +68,7 @@ steps: - cat dist/checksums.txt release: - image: plugins/github-release + image: docker.io/plugins/github-release secrets: - source: github_token target: github_release_api_key diff --git a/.woodpecker/docker.yml b/.woodpecker/docker.yml index b64406f0a1..e81cec3d80 100644 --- a/.woodpecker/docker.yml +++ b/.woodpecker/docker.yml @@ -10,11 +10,12 @@ depends_on: - web variables: - - &golang_image 'golang:1.21.3' - - &node_image 'node:21-alpine' - - &xgo_image 'techknowlogick/xgo:go-1.21.3' - - &xgo_version 'go-1.21.2' - - &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' + - &golang_image 'docker.io/golang:1.19.5' + - &node_image 'docker.io/node:18-alpine' + - &xgo_image 'docker.io/techknowlogick/xgo:go-1.19.5' + - &buildx_plugin 'quay.io/woodpeckerci/plugin-docker-buildx' + - &xgo_version 'go-1.19.5' + - &platforms_release 'linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/386,linux/amd64,linux/ppc64le,linux/riscv64,linux/s390x,windows/amd64,freebsd/arm64,freebsd/amd64,openbsd/arm64,openbsd/amd64' - &platforms_server 'linux/arm/v7,linux/arm64/v8,linux/amd64,linux/ppc64le,linux/riscv64' - &platforms_preview 'linux/amd64' - &platforms_alpine 'linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/amd64,linux/ppc64le' @@ -102,7 +103,7 @@ steps: path: *when_path publish-server-preview: - image: woodpeckerci/plugin-docker-buildx:2.2.0 + image: quay.io/woodpeckerci/plugin-docker-buildx:2.2.0 group: docker settings: repo: woodpeckerci/woodpecker-server @@ -115,7 +116,7 @@ steps: event: pull_request publish-server-alpine-preview: - image: woodpeckerci/plugin-docker-buildx:2.2.0 + image: quay.io/woodpeckerci/plugin-docker-buildx:2.2.0 group: docker settings: repo: woodpeckerci/woodpecker-server @@ -128,7 +129,7 @@ steps: event: pull_request build-server: - image: woodpeckerci/plugin-docker-buildx:2.2.0 + image: quay.io/woodpeckerci/plugin-docker-buildx:2.2.0 group: docker settings: dry_run: true @@ -142,7 +143,7 @@ steps: path: *when_path build-server-alpine: - image: woodpeckerci/plugin-docker-buildx:2.2.0 + image: quay.io/woodpeckerci/plugin-docker-buildx:2.2.0 group: docker settings: dry_run: true @@ -166,15 +167,9 @@ steps: PLATFORMS: linux|arm/v7;linux|arm64/v8;linux|amd64;linux|ppc64le;linux|riscv64 TAGS: bindata sqlite sqlite_unlock_notify netgo XGO_VERSION: *xgo_version - when: - branch: - - ${CI_REPO_DEFAULT_BRANCH} - - release/* - event: [push, tag] - path: *when_path publish-next-server: - image: woodpeckerci/plugin-docker-buildx:2.2.0 + image: *buildx_plugin group: docker settings: repo: *publish_repos_server @@ -188,7 +183,7 @@ steps: path: *when_path publish-next-server-alpine: - image: woodpeckerci/plugin-docker-buildx:2.2.0 + image: *buildx_plugin group: docker settings: repo: *publish_repos_server @@ -202,7 +197,7 @@ steps: path: *when_path publish-release-branch-server: - image: woodpeckerci/plugin-docker-buildx:2.2.0 + image: *buildx_plugin group: docker settings: repo: *publish_repos_server @@ -216,7 +211,7 @@ steps: path: *when_path publish-release-branch-server-alpine: - image: woodpeckerci/plugin-docker-buildx:2.2.0 + image: *buildx_plugin group: docker settings: repo: *publish_repos_server @@ -231,7 +226,8 @@ steps: release-server: group: docker - image: woodpeckerci/plugin-docker-buildx:2.2.0 + image: *buildx_plugin + secrets: [docker_username, docker_password] settings: repo: *publish_repos_server dockerfile: docker/Dockerfile.server.multiarch @@ -244,7 +240,8 @@ steps: release-server-alpine: group: docker - image: woodpeckerci/plugin-docker-buildx:2.2.0 + image: *buildx_plugin + secrets: [docker_username, docker_password] settings: repo: *publish_repos_server dockerfile: docker/Dockerfile.server.alpine.multiarch @@ -261,7 +258,8 @@ steps: publish-agent-preview: group: docker - image: woodpeckerci/plugin-docker-buildx:2.2.0 + image: *buildx_plugin + secrets: [docker_username, docker_password] settings: repo: woodpeckerci/woodpecker-agent dockerfile: docker/Dockerfile.agent.multiarch @@ -275,7 +273,7 @@ steps: build-agent: group: docker - image: woodpeckerci/plugin-docker-buildx:2.2.0 + image: quay.io/woodpeckerci/plugin-docker-buildx:2.2.0 settings: dry_run: true repo: woodpeckerci/woodpecker-agent @@ -290,7 +288,8 @@ steps: publish-next-agent: group: docker - image: woodpeckerci/plugin-docker-buildx:2.2.0 + image: *buildx_plugin + secrets: [docker_username, docker_password] settings: repo: *publish_repos_agent dockerfile: docker/Dockerfile.agent.multiarch @@ -305,7 +304,8 @@ steps: publish-next-agent-alpine: group: docker - image: woodpeckerci/plugin-docker-buildx:2.2.0 + image: *buildx_plugin + secrets: [docker_username, docker_password] settings: repo: *publish_repos_agent dockerfile: docker/Dockerfile.agent.alpine.multiarch @@ -320,7 +320,8 @@ steps: publish-release-branch-agent: group: docker - image: woodpeckerci/plugin-docker-buildx:2.2.0 + image: *buildx_plugin + secrets: [docker_username, docker_password] settings: repo: *publish_repos_agent dockerfile: docker/Dockerfile.agent.multiarch @@ -335,7 +336,8 @@ steps: publish-release-branch-agent-alpine: group: docker - image: woodpeckerci/plugin-docker-buildx:2.2.0 + image: *buildx_plugin + secrets: [docker_username, docker_password] settings: repo: *publish_repos_agent dockerfile: docker/Dockerfile.agent.alpine.multiarch @@ -350,7 +352,8 @@ steps: release-agent: group: docker - image: woodpeckerci/plugin-docker-buildx:2.2.0 + image: *buildx_plugin + secrets: [docker_username, docker_password] settings: repo: *publish_repos_agent dockerfile: docker/Dockerfile.agent.multiarch @@ -364,7 +367,8 @@ steps: release-agent-alpine: group: docker - image: woodpeckerci/plugin-docker-buildx:2.2.0 + image: *buildx_plugin + secrets: [docker_username, docker_password] settings: repo: *publish_repos_agent dockerfile: docker/Dockerfile.agent.alpine.multiarch @@ -382,7 +386,8 @@ steps: publish-cli-preview: group: docker - image: woodpeckerci/plugin-docker-buildx:2.2.0 + image: *buildx_plugin + secrets: [docker_username, docker_password] settings: repo: woodpeckerci/woodpecker-cli dockerfile: docker/Dockerfile.cli.multiarch @@ -396,7 +401,7 @@ steps: build-cli: group: docker - image: woodpeckerci/plugin-docker-buildx:2.2.0 + image: quay.io/woodpeckerci/plugin-docker-buildx:2.2.0 settings: dry_run: true repo: woodpeckerci/woodpecker-cli @@ -411,7 +416,8 @@ steps: publish-next-cli: group: docker - image: woodpeckerci/plugin-docker-buildx:2.2.0 + image: *buildx_plugin + secrets: [docker_username, docker_password] settings: repo: *publish_repos_cli dockerfile: docker/Dockerfile.cli.multiarch @@ -426,7 +432,8 @@ steps: publish-next-cli-alpine: group: docker - image: woodpeckerci/plugin-docker-buildx:2.2.0 + image: *buildx_plugin + secrets: [docker_username, docker_password] settings: repo: *publish_repos_cli dockerfile: docker/Dockerfile.cli.alpine.multiarch @@ -441,7 +448,8 @@ steps: publish-release-branch-cli: group: docker - image: woodpeckerci/plugin-docker-buildx:2.2.0 + image: *buildx_plugin + secrets: [docker_username, docker_password] settings: repo: *publish_repos_cli dockerfile: docker/Dockerfile.cli.multiarch @@ -456,7 +464,8 @@ steps: publish-release-branch-cli-alpine: group: docker - image: woodpeckerci/plugin-docker-buildx:2.2.0 + image: *buildx_plugin + secrets: [docker_username, docker_password] settings: repo: *publish_repos_cli dockerfile: docker/Dockerfile.cli.alpine.multiarch @@ -471,7 +480,8 @@ steps: release-cli: group: docker - image: woodpeckerci/plugin-docker-buildx:2.2.0 + image: *buildx_plugin + secrets: [docker_username, docker_password] settings: repo: *publish_repos_cli dockerfile: docker/Dockerfile.cli.multiarch @@ -485,7 +495,8 @@ steps: release-cli-alpine: group: docker - image: woodpeckerci/plugin-docker-buildx:2.2.0 + image: *buildx_plugin + secrets: [docker_username, docker_password] settings: repo: *publish_repos_cli dockerfile: docker/Dockerfile.cli.alpine.multiarch diff --git a/.woodpecker/docs.yml b/.woodpecker/docs.yml index a228f28476..0686936812 100644 --- a/.woodpecker/docs.yml +++ b/.woodpecker/docs.yml @@ -14,8 +14,8 @@ when: event: cron variables: - - &golang_image 'golang:1.21.3' - - &node_image 'node:21-alpine' + - &golang_image 'docker.io/golang:1.21.3' + - &node_image 'docker.io/node:21-alpine' steps: build-cli: @@ -38,7 +38,7 @@ steps: - event: cron deploy-preview: - image: woodpeckerci/plugin-surge-preview:1.2.2 + image: quay.io/woodpeckerci/plugin-surge-preview:1.2.2 settings: path: 'docs/build/' surge_token: @@ -55,7 +55,7 @@ steps: # TODO: add step to remove preview again after PR is closed (waiting for #286) deploy: - image: alpine:3.18 + image: docker.io/alpine:3.18 secrets: - BOT_PRIVATE_KEY commands: diff --git a/.woodpecker/test.yml b/.woodpecker/test.yml index c1ae0058b4..b2b9a7a70f 100644 --- a/.woodpecker/test.yml +++ b/.woodpecker/test.yml @@ -6,7 +6,7 @@ when: - release/* variables: - - &golang_image 'golang:1.21.3' + - &golang_image 'docker.io/golang:1.21.3' - &when - path: &when_path # related config files - '.woodpecker/test.yml' @@ -63,7 +63,7 @@ steps: when: *when lint-editorconfig: - image: mstruebing/editorconfig-checker:2.7.2 + image: docker.io/mstruebing/editorconfig-checker:2.7.2 group: test when: - event: [pull_request, tag] @@ -77,7 +77,7 @@ steps: when: *when prettier: - image: woodpeckerci/plugin-prettier:next + image: quay.io/woodpeckerci/plugin-prettier:next group: test when: *when @@ -124,7 +124,7 @@ steps: codecov: pull: true - image: woodpeckerci/plugin-codecov:2.1.2 + image: quay.io/woodpeckerci/plugin-codecov:2.1.2 settings: files: - agent-coverage.out @@ -140,7 +140,7 @@ steps: services: service-postgres: - image: postgres:16 + image: docker.io/postgres:16 ports: ['5432'] environment: - POSTGRES_USER=postgres @@ -148,7 +148,7 @@ services: when: *when service-mysql: - image: mysql:8.2.0 + image: docker.io/mysql:8.2.0 ports: ['3306'] environment: - MYSQL_DATABASE=test diff --git a/.woodpecker/web.yml b/.woodpecker/web.yml index 52aa3fef18..bacdb9a99f 100644 --- a/.woodpecker/web.yml +++ b/.woodpecker/web.yml @@ -6,7 +6,7 @@ when: - release/* variables: - - &node_image 'node:21-alpine' + - &node_image 'docker.io/node:21-alpine' - &when path: # related config files diff --git a/docker/Dockerfile.agent.alpine.multiarch b/docker/Dockerfile.agent.alpine.multiarch index e26ecfbca5..b294377e8a 100644 --- a/docker/Dockerfile.agent.alpine.multiarch +++ b/docker/Dockerfile.agent.alpine.multiarch @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM golang:1.21 AS build +FROM --platform=$BUILDPLATFORM docker.io/golang:1.21 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.18 +FROM docker.io/alpine:3.18 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 51a28c5d91..8c9d69e9bd 100644 --- a/docker/Dockerfile.agent.multiarch +++ b/docker/Dockerfile.agent.multiarch @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM golang:1.21 AS build +FROM --platform=$BUILDPLATFORM docker.io/golang:1.21 AS build WORKDIR /src COPY . . diff --git a/docker/Dockerfile.cli.alpine.multiarch b/docker/Dockerfile.cli.alpine.multiarch index 9155e9a7e9..0e647eb7bb 100644 --- a/docker/Dockerfile.cli.alpine.multiarch +++ b/docker/Dockerfile.cli.alpine.multiarch @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM golang:1.21 AS build +FROM --platform=$BUILDPLATFORM docker.io/golang:1.21 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.18 +FROM docker.io/alpine:3.18 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 bacc6fbc35..223aa0eff4 100644 --- a/docker/Dockerfile.cli.multiarch +++ b/docker/Dockerfile.cli.multiarch @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM golang:1.21 AS build +FROM --platform=$BUILDPLATFORM docker.io/olang:1.21 AS build WORKDIR /src COPY . . diff --git a/docker/Dockerfile.make b/docker/Dockerfile.make index b730a358c3..8c1695986c 100644 --- a/docker/Dockerfile.make +++ b/docker/Dockerfile.make @@ -1,5 +1,5 @@ # docker build --rm -f docker/Dockerfile.make -t woodpecker/make:local . -FROM golang:1.21-alpine as golang_image +FROM docker.io/golang:1.21-alpine as golang_image FROM node:21-alpine RUN apk add --no-cache --update make gcc binutils-gold musl-dev && \ diff --git a/docker/Dockerfile.server.alpine.multiarch b/docker/Dockerfile.server.alpine.multiarch index d1835a55a3..20fcaf4157 100644 --- a/docker/Dockerfile.server.alpine.multiarch +++ b/docker/Dockerfile.server.alpine.multiarch @@ -1,4 +1,4 @@ -FROM alpine:3.18 +FROM docker.io/alpine:3.18 ARG TARGETOS TARGETARCH RUN apk add -U --no-cache ca-certificates diff --git a/docker/Dockerfile.server.multiarch b/docker/Dockerfile.server.multiarch index 05d31d8e18..251d5108b6 100644 --- a/docker/Dockerfile.server.multiarch +++ b/docker/Dockerfile.server.multiarch @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM golang:1.21 AS certs +FROM --platform=$BUILDPLATFORM docker.io/golang:1.21 AS certs FROM scratch ARG TARGETOS TARGETARCH diff --git a/shared/constant/constant.go b/shared/constant/constant.go index 3d46ee769b..1716990c5f 100644 --- a/shared/constant/constant.go +++ b/shared/constant/constant.go @@ -16,10 +16,10 @@ package constant // PrivilegedPlugins can be changed by 'WOODPECKER_ESCALATE' at runtime var PrivilegedPlugins = []string{ - "plugins/docker", - "plugins/gcr", - "plugins/ecr", - "woodpeckerci/plugin-docker-buildx", + "docker.io/plugins/docker", + "docker.io/plugins/gcr", + "docker.io/plugins/ecr", + "quay.io/woodpeckerci/plugin-docker-buildx", "codeberg.org/woodpecker-plugins/docker-buildx", } @@ -33,7 +33,7 @@ var DefaultConfigOrder = [...]string{ const ( // DefaultCloneImage can be changed by 'WOODPECKER_DEFAULT_CLONE_IMAGE' at runtime - DefaultCloneImage = "docker.io/woodpeckerci/plugin-git:2.1.1" + DefaultCloneImage = "quay.io/woodpeckerci/plugin-git:2.1.1" ) var TrustedCloneImages = []string{ From bbf785d61e9c845d25e3e1ea3ef67c549ed71053 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Wed, 1 Nov 2023 11:59:55 +0100 Subject: [PATCH 2/5] cleanup --- .woodpecker/binaries.yml | 4 ++++ .woodpecker/docker.yml | 46 ++++++++++++++++------------------------ docker/Dockerfile.make | 2 +- 3 files changed, 23 insertions(+), 29 deletions(-) diff --git a/.woodpecker/binaries.yml b/.woodpecker/binaries.yml index 32e90b0be0..fd6aaf106a 100644 --- a/.woodpecker/binaries.yml +++ b/.woodpecker/binaries.yml @@ -2,6 +2,10 @@ depends_on: - test - web +# TODO: upload build artifacts for pushes to ${CI_REPO_DEFAULT_BRANCH} +when: + event: tag + variables: - &golang_image 'docker.io/golang:1.21.3' - &node_image 'docker.io/node:21-alpine' diff --git a/.woodpecker/docker.yml b/.woodpecker/docker.yml index e81cec3d80..f2231ecf21 100644 --- a/.woodpecker/docker.yml +++ b/.woodpecker/docker.yml @@ -10,12 +10,12 @@ depends_on: - web variables: - - &golang_image 'docker.io/golang:1.19.5' - - &node_image 'docker.io/node:18-alpine' - - &xgo_image 'docker.io/techknowlogick/xgo:go-1.19.5' - - &buildx_plugin 'quay.io/woodpeckerci/plugin-docker-buildx' - - &xgo_version 'go-1.19.5' - - &platforms_release 'linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/386,linux/amd64,linux/ppc64le,linux/riscv64,linux/s390x,windows/amd64,freebsd/arm64,freebsd/amd64,openbsd/arm64,openbsd/amd64' + - &golang_image 'docker.io/golang:1.21.3' + - &node_image 'docker.io/node:21-alpine' + - &xgo_image 'docker.io/techknowlogick/xgo:go-1.21.3' + - &xgo_version 'go-1.21.2' + - &buildx_plugin 'quay.io/woodpeckerci/plugin-docker-buildx:2.2.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' - &platforms_server 'linux/arm/v7,linux/arm64/v8,linux/amd64,linux/ppc64le,linux/riscv64' - &platforms_preview 'linux/amd64' - &platforms_alpine 'linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/amd64,linux/ppc64le' @@ -103,7 +103,7 @@ steps: path: *when_path publish-server-preview: - image: quay.io/woodpeckerci/plugin-docker-buildx:2.2.0 + image: *buildx_plugin group: docker settings: repo: woodpeckerci/woodpecker-server @@ -116,7 +116,7 @@ steps: event: pull_request publish-server-alpine-preview: - image: quay.io/woodpeckerci/plugin-docker-buildx:2.2.0 + image: *buildx_plugin group: docker settings: repo: woodpeckerci/woodpecker-server @@ -129,7 +129,7 @@ steps: event: pull_request build-server: - image: quay.io/woodpeckerci/plugin-docker-buildx:2.2.0 + image: *buildx_plugin group: docker settings: dry_run: true @@ -143,7 +143,7 @@ steps: path: *when_path build-server-alpine: - image: quay.io/woodpeckerci/plugin-docker-buildx:2.2.0 + image: *buildx_plugin group: docker settings: dry_run: true @@ -167,6 +167,12 @@ steps: PLATFORMS: linux|arm/v7;linux|arm64/v8;linux|amd64;linux|ppc64le;linux|riscv64 TAGS: bindata sqlite sqlite_unlock_notify netgo XGO_VERSION: *xgo_version + when: + branch: + - ${CI_REPO_DEFAULT_BRANCH} + - release/* + event: [push, tag] + path: *when_path publish-next-server: image: *buildx_plugin @@ -227,7 +233,6 @@ steps: release-server: group: docker image: *buildx_plugin - secrets: [docker_username, docker_password] settings: repo: *publish_repos_server dockerfile: docker/Dockerfile.server.multiarch @@ -241,7 +246,6 @@ steps: release-server-alpine: group: docker image: *buildx_plugin - secrets: [docker_username, docker_password] settings: repo: *publish_repos_server dockerfile: docker/Dockerfile.server.alpine.multiarch @@ -259,7 +263,6 @@ steps: publish-agent-preview: group: docker image: *buildx_plugin - secrets: [docker_username, docker_password] settings: repo: woodpeckerci/woodpecker-agent dockerfile: docker/Dockerfile.agent.multiarch @@ -273,7 +276,7 @@ steps: build-agent: group: docker - image: quay.io/woodpeckerci/plugin-docker-buildx:2.2.0 + image: *buildx_plugin settings: dry_run: true repo: woodpeckerci/woodpecker-agent @@ -289,7 +292,6 @@ steps: publish-next-agent: group: docker image: *buildx_plugin - secrets: [docker_username, docker_password] settings: repo: *publish_repos_agent dockerfile: docker/Dockerfile.agent.multiarch @@ -305,7 +307,6 @@ steps: publish-next-agent-alpine: group: docker image: *buildx_plugin - secrets: [docker_username, docker_password] settings: repo: *publish_repos_agent dockerfile: docker/Dockerfile.agent.alpine.multiarch @@ -321,7 +322,6 @@ steps: publish-release-branch-agent: group: docker image: *buildx_plugin - secrets: [docker_username, docker_password] settings: repo: *publish_repos_agent dockerfile: docker/Dockerfile.agent.multiarch @@ -337,7 +337,6 @@ steps: publish-release-branch-agent-alpine: group: docker image: *buildx_plugin - secrets: [docker_username, docker_password] settings: repo: *publish_repos_agent dockerfile: docker/Dockerfile.agent.alpine.multiarch @@ -353,7 +352,6 @@ steps: release-agent: group: docker image: *buildx_plugin - secrets: [docker_username, docker_password] settings: repo: *publish_repos_agent dockerfile: docker/Dockerfile.agent.multiarch @@ -368,7 +366,6 @@ steps: release-agent-alpine: group: docker image: *buildx_plugin - secrets: [docker_username, docker_password] settings: repo: *publish_repos_agent dockerfile: docker/Dockerfile.agent.alpine.multiarch @@ -387,7 +384,6 @@ steps: publish-cli-preview: group: docker image: *buildx_plugin - secrets: [docker_username, docker_password] settings: repo: woodpeckerci/woodpecker-cli dockerfile: docker/Dockerfile.cli.multiarch @@ -401,7 +397,7 @@ steps: build-cli: group: docker - image: quay.io/woodpeckerci/plugin-docker-buildx:2.2.0 + image: *buildx_plugin settings: dry_run: true repo: woodpeckerci/woodpecker-cli @@ -417,7 +413,6 @@ steps: publish-next-cli: group: docker image: *buildx_plugin - secrets: [docker_username, docker_password] settings: repo: *publish_repos_cli dockerfile: docker/Dockerfile.cli.multiarch @@ -433,7 +428,6 @@ steps: publish-next-cli-alpine: group: docker image: *buildx_plugin - secrets: [docker_username, docker_password] settings: repo: *publish_repos_cli dockerfile: docker/Dockerfile.cli.alpine.multiarch @@ -449,7 +443,6 @@ steps: publish-release-branch-cli: group: docker image: *buildx_plugin - secrets: [docker_username, docker_password] settings: repo: *publish_repos_cli dockerfile: docker/Dockerfile.cli.multiarch @@ -465,7 +458,6 @@ steps: publish-release-branch-cli-alpine: group: docker image: *buildx_plugin - secrets: [docker_username, docker_password] settings: repo: *publish_repos_cli dockerfile: docker/Dockerfile.cli.alpine.multiarch @@ -481,7 +473,6 @@ steps: release-cli: group: docker image: *buildx_plugin - secrets: [docker_username, docker_password] settings: repo: *publish_repos_cli dockerfile: docker/Dockerfile.cli.multiarch @@ -496,7 +487,6 @@ steps: release-cli-alpine: group: docker image: *buildx_plugin - secrets: [docker_username, docker_password] settings: repo: *publish_repos_cli dockerfile: docker/Dockerfile.cli.alpine.multiarch diff --git a/docker/Dockerfile.make b/docker/Dockerfile.make index 8c1695986c..05918fa681 100644 --- a/docker/Dockerfile.make +++ b/docker/Dockerfile.make @@ -1,6 +1,6 @@ # docker build --rm -f docker/Dockerfile.make -t woodpecker/make:local . FROM docker.io/golang:1.21-alpine as golang_image -FROM node:21-alpine +FROM docker.io/node:21-alpine RUN apk add --no-cache --update make gcc binutils-gold musl-dev && \ corepack enable From 3e3ea73e4d3bd359c1c261ad95ab6d99428b94eb Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Wed, 1 Nov 2023 12:16:13 +0100 Subject: [PATCH 3/5] review feedback --- .woodpecker/docker.yml | 2 +- .woodpecker/docs.yml | 2 +- .woodpecker/test.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.woodpecker/docker.yml b/.woodpecker/docker.yml index f2231ecf21..d9dfb9f179 100644 --- a/.woodpecker/docker.yml +++ b/.woodpecker/docker.yml @@ -14,7 +14,7 @@ variables: - &node_image 'docker.io/node:21-alpine' - &xgo_image 'docker.io/techknowlogick/xgo:go-1.21.3' - &xgo_version 'go-1.21.2' - - &buildx_plugin 'quay.io/woodpeckerci/plugin-docker-buildx:2.2.0' + - &buildx_plugin 'docker.io/woodpeckerci/plugin-docker-buildx:2.2.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' - &platforms_server 'linux/arm/v7,linux/arm64/v8,linux/amd64,linux/ppc64le,linux/riscv64' - &platforms_preview 'linux/amd64' diff --git a/.woodpecker/docs.yml b/.woodpecker/docs.yml index 0686936812..2a03519ab9 100644 --- a/.woodpecker/docs.yml +++ b/.woodpecker/docs.yml @@ -38,7 +38,7 @@ steps: - event: cron deploy-preview: - image: quay.io/woodpeckerci/plugin-surge-preview:1.2.2 + image: docker.io/woodpeckerci/plugin-surge-preview:1.2.2 settings: path: 'docs/build/' surge_token: diff --git a/.woodpecker/test.yml b/.woodpecker/test.yml index b2b9a7a70f..b8ce27cc21 100644 --- a/.woodpecker/test.yml +++ b/.woodpecker/test.yml @@ -77,7 +77,7 @@ steps: when: *when prettier: - image: quay.io/woodpeckerci/plugin-prettier:next + image: docker.io/woodpeckerci/plugin-prettier:next group: test when: *when @@ -124,7 +124,7 @@ steps: codecov: pull: true - image: quay.io/woodpeckerci/plugin-codecov:2.1.2 + image: docker.io/woodpeckerci/plugin-codecov:2.1.2 settings: files: - agent-coverage.out From ec83962c26bd39b8f9e246466a1b8e1ad2240b89 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Wed, 1 Nov 2023 12:17:07 +0100 Subject: [PATCH 4/5] review feedback --- shared/constant/constant.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared/constant/constant.go b/shared/constant/constant.go index 1716990c5f..8aeea81a69 100644 --- a/shared/constant/constant.go +++ b/shared/constant/constant.go @@ -33,7 +33,7 @@ var DefaultConfigOrder = [...]string{ const ( // DefaultCloneImage can be changed by 'WOODPECKER_DEFAULT_CLONE_IMAGE' at runtime - DefaultCloneImage = "quay.io/woodpeckerci/plugin-git:2.1.1" + DefaultCloneImage = "docker.io/woodpeckerci/plugin-git:2.1.1" ) var TrustedCloneImages = []string{ From 29aaf5eaecb10b0c1e8aa3bf0bab663aceb2231c Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Wed, 1 Nov 2023 12:19:05 +0100 Subject: [PATCH 5/5] dont change PrivilegedPlugins --- shared/constant/constant.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/shared/constant/constant.go b/shared/constant/constant.go index 8aeea81a69..3d46ee769b 100644 --- a/shared/constant/constant.go +++ b/shared/constant/constant.go @@ -16,10 +16,10 @@ package constant // PrivilegedPlugins can be changed by 'WOODPECKER_ESCALATE' at runtime var PrivilegedPlugins = []string{ - "docker.io/plugins/docker", - "docker.io/plugins/gcr", - "docker.io/plugins/ecr", - "quay.io/woodpeckerci/plugin-docker-buildx", + "plugins/docker", + "plugins/gcr", + "plugins/ecr", + "woodpeckerci/plugin-docker-buildx", "codeberg.org/woodpecker-plugins/docker-buildx", }