Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use full qualifyer for images #2692

Merged
merged 5 commits into from
Nov 1, 2023
Merged

Use full qualifyer for images #2692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6f43406
Add full qualifier "docker.io" and use quay.io if possible
6543 Mar 20, 2023
bbf785d
cleanup
xoxys Nov 1, 2023
3e3ea73
review feedback
xoxys Nov 1, 2023
ec83962
review feedback
xoxys Nov 1, 2023
29aaf5e
dont change PrivilegedPlugins
xoxys Nov 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .woodpecker/binaries.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
anbraten marked this conversation as resolved.
Show resolved Hide resolved
- &node_image 'docker.io/node:21-alpine'
- &xgo_image 'docker.io/techknowlogick/xgo:go-1.21.3'
- &xgo_version 'go-1.21.2'

steps:
Expand Down Expand Up @@ -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
Expand Down
59 changes: 30 additions & 29 deletions .woodpecker/docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions .woodpecker/docs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand Down
12 changes: 6 additions & 6 deletions .woodpecker/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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]
Expand All @@ -77,7 +77,7 @@ steps:
when: *when

prettier:
image: woodpeckerci/plugin-prettier:next
image: docker.io/woodpeckerci/plugin-prettier:next
group: test
when: *when

Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .woodpecker/web.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ when:
- release/*

variables:
- &node_image 'node:21-alpine'
- &node_image 'docker.io/node:21-alpine'
- &when
path:
# related config files
Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile.agent.alpine.multiarch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 . .
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.agent.multiarch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 . .
Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile.cli.alpine.multiarch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 . .
Expand All @@ -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

Expand Down
Loading