Use full qualifyer for images (#2692)

Supersedes #1659 --------- Co-authored-by: 6543 <6543@obermui.de>
woodpecker-ci · Nov 1, 2023 · 1f7c087 · 1f7c087
1 parent 48e4ece
commit 1f7c087
Show file tree

Hide file tree

Showing 12 changed files with 55 additions and 54 deletions.
diff --git a/.woodpecker/binaries.yml b/.woodpecker/binaries.yml
@@ -7,9 +7,9 @@ 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 +72,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
@@ -10,10 +10,11 @@ depends_on:
   - web
 
 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'
+  - &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'
@@ -102,7 +103,7 @@ steps:
         path: *when_path
 
   publish-server-preview:
-    image: woodpeckerci/plugin-docker-buildx:2.2.0
+    image: *buildx_plugin
     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: *buildx_plugin
     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: *buildx_plugin
     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: *buildx_plugin
     group: docker
     settings:
       dry_run: true
@@ -174,7 +175,7 @@ steps:
       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 +189,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 +203,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 +217,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 +232,7 @@ steps:
 
   release-server:
     group: docker
-    image: woodpeckerci/plugin-docker-buildx:2.2.0
+    image: *buildx_plugin
     settings:
       repo: *publish_repos_server
       dockerfile: docker/Dockerfile.server.multiarch
@@ -244,7 +245,7 @@ steps:
 
   release-server-alpine:
     group: docker
-    image: woodpeckerci/plugin-docker-buildx:2.2.0
+    image: *buildx_plugin
     settings:
       repo: *publish_repos_server
       dockerfile: docker/Dockerfile.server.alpine.multiarch
@@ -261,7 +262,7 @@ steps:
 
   publish-agent-preview:
     group: docker
-    image: woodpeckerci/plugin-docker-buildx:2.2.0
+    image: *buildx_plugin
     settings:
       repo: woodpeckerci/woodpecker-agent
       dockerfile: docker/Dockerfile.agent.multiarch
@@ -275,7 +276,7 @@ steps:
 
   build-agent:
     group: docker
-    image: woodpeckerci/plugin-docker-buildx:2.2.0
+    image: *buildx_plugin
     settings:
       dry_run: true
       repo: woodpeckerci/woodpecker-agent
@@ -290,7 +291,7 @@ steps:
 
   publish-next-agent:
     group: docker
-    image: woodpeckerci/plugin-docker-buildx:2.2.0
+    image: *buildx_plugin
     settings:
       repo: *publish_repos_agent
       dockerfile: docker/Dockerfile.agent.multiarch
@@ -305,7 +306,7 @@ steps:
 
   publish-next-agent-alpine:
     group: docker
-    image: woodpeckerci/plugin-docker-buildx:2.2.0
+    image: *buildx_plugin
     settings:
       repo: *publish_repos_agent
       dockerfile: docker/Dockerfile.agent.alpine.multiarch
@@ -320,7 +321,7 @@ steps:
 
   publish-release-branch-agent:
     group: docker
-    image: woodpeckerci/plugin-docker-buildx:2.2.0
+    image: *buildx_plugin
     settings:
       repo: *publish_repos_agent
       dockerfile: docker/Dockerfile.agent.multiarch
@@ -335,7 +336,7 @@ steps:
 
   publish-release-branch-agent-alpine:
     group: docker
-    image: woodpeckerci/plugin-docker-buildx:2.2.0
+    image: *buildx_plugin
     settings:
       repo: *publish_repos_agent
       dockerfile: docker/Dockerfile.agent.alpine.multiarch
@@ -350,7 +351,7 @@ steps:
 
   release-agent:
     group: docker
-    image: woodpeckerci/plugin-docker-buildx:2.2.0
+    image: *buildx_plugin
     settings:
       repo: *publish_repos_agent
       dockerfile: docker/Dockerfile.agent.multiarch
@@ -364,7 +365,7 @@ steps:
 
   release-agent-alpine:
     group: docker
-    image: woodpeckerci/plugin-docker-buildx:2.2.0
+    image: *buildx_plugin
     settings:
       repo: *publish_repos_agent
       dockerfile: docker/Dockerfile.agent.alpine.multiarch
@@ -382,7 +383,7 @@ steps:
 
   publish-cli-preview:
     group: docker
-    image: woodpeckerci/plugin-docker-buildx:2.2.0
+    image: *buildx_plugin
     settings:
       repo: woodpeckerci/woodpecker-cli
       dockerfile: docker/Dockerfile.cli.multiarch
@@ -396,7 +397,7 @@ steps:
 
   build-cli:
     group: docker
-    image: woodpeckerci/plugin-docker-buildx:2.2.0
+    image: *buildx_plugin
     settings:
       dry_run: true
       repo: woodpeckerci/woodpecker-cli
@@ -411,7 +412,7 @@ steps:
 
   publish-next-cli:
     group: docker
-    image: woodpeckerci/plugin-docker-buildx:2.2.0
+    image: *buildx_plugin
     settings:
       repo: *publish_repos_cli
       dockerfile: docker/Dockerfile.cli.multiarch
@@ -426,7 +427,7 @@ steps:
 
   publish-next-cli-alpine:
     group: docker
-    image: woodpeckerci/plugin-docker-buildx:2.2.0
+    image: *buildx_plugin
     settings:
       repo: *publish_repos_cli
       dockerfile: docker/Dockerfile.cli.alpine.multiarch
@@ -441,7 +442,7 @@ steps:
 
   publish-release-branch-cli:
     group: docker
-    image: woodpeckerci/plugin-docker-buildx:2.2.0
+    image: *buildx_plugin
     settings:
       repo: *publish_repos_cli
       dockerfile: docker/Dockerfile.cli.multiarch
@@ -456,7 +457,7 @@ steps:
 
   publish-release-branch-cli-alpine:
     group: docker
-    image: woodpeckerci/plugin-docker-buildx:2.2.0
+    image: *buildx_plugin
     settings:
       repo: *publish_repos_cli
       dockerfile: docker/Dockerfile.cli.alpine.multiarch
@@ -471,7 +472,7 @@ steps:
 
   release-cli:
     group: docker
-    image: woodpeckerci/plugin-docker-buildx:2.2.0
+    image: *buildx_plugin
     settings:
       repo: *publish_repos_cli
       dockerfile: docker/Dockerfile.cli.multiarch
@@ -485,7 +486,7 @@ steps:
 
   release-cli-alpine:
     group: docker
-    image: woodpeckerci/plugin-docker-buildx:2.2.0
+    image: *buildx_plugin
     settings:
       repo: *publish_repos_cli
       dockerfile: docker/Dockerfile.cli.alpine.multiarch

diff --git 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: docker.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
@@ -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: docker.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: docker.io/woodpeckerci/plugin-codecov:2.1.2
     settings:
       files:
         - agent-coverage.out
@@ -140,15 +140,15 @@ steps:
 
 services:
   service-postgres:
-    image: postgres:16
+    image: docker.io/postgres:16
     ports: ['5432']
     environment:
       - POSTGRES_USER=postgres
       - POSTGRES_HOST_AUTH_METHOD=trust
     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
@@ -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
@@ -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
@@ -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
@@ -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