From bf8f09cf98913808d790133185b6d796d8db2cf3 Mon Sep 17 00:00:00 2001 From: Vladimir Hodakov Date: Tue, 14 Jan 2025 01:23:28 +0400 Subject: [PATCH 1/3] Use dind for dry-run --- .woodpecker/docker.yaml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/.woodpecker/docker.yaml b/.woodpecker/docker.yaml index dc06e8c..91b9505 100644 --- a/.woodpecker/docker.yaml +++ b/.woodpecker/docker.yaml @@ -15,14 +15,11 @@ variables: steps: test-build: - image: woodpeckerci/plugin-docker-buildx:5.1.0 - privileged: true - settings: - dockerfile: Dockerfile - platforms: ${platform} - dry_run: true - repo: *repo - auto_tag: true + image: docker:27-dind + commands: + - docker build -t source.hodakov.me/hdkv/phpbb:${CI_COMMIT_SHA:0:10} . + volumes: + - /var/run/docker.sock:/var/run/docker.sock when: event: pull_request -- 2.45.2 From 8998b479844a320bb38679e2a8521d08a95c32fc Mon Sep 17 00:00:00 2001 From: Vladimir Hodakov Date: Tue, 14 Jan 2025 01:38:57 +0400 Subject: [PATCH 2/3] Revert "Use dind for dry-run" This reverts commit bf8f09cf98913808d790133185b6d796d8db2cf3. --- .woodpecker/docker.yaml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.woodpecker/docker.yaml b/.woodpecker/docker.yaml index 91b9505..dc06e8c 100644 --- a/.woodpecker/docker.yaml +++ b/.woodpecker/docker.yaml @@ -15,11 +15,14 @@ variables: steps: test-build: - image: docker:27-dind - commands: - - docker build -t source.hodakov.me/hdkv/phpbb:${CI_COMMIT_SHA:0:10} . - volumes: - - /var/run/docker.sock:/var/run/docker.sock + image: woodpeckerci/plugin-docker-buildx:5.1.0 + privileged: true + settings: + dockerfile: Dockerfile + platforms: ${platform} + dry_run: true + repo: *repo + auto_tag: true when: event: pull_request -- 2.45.2 From aa11933e4fa92153e36f02d058800aa61247ecd6 Mon Sep 17 00:00:00 2001 From: Vladimir Hodakov Date: Tue, 14 Jan 2025 01:43:11 +0400 Subject: [PATCH 3/3] Don't write platform specifically --- .woodpecker/docker.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.woodpecker/docker.yaml b/.woodpecker/docker.yaml index dc06e8c..4dc6595 100644 --- a/.woodpecker/docker.yaml +++ b/.woodpecker/docker.yaml @@ -19,7 +19,6 @@ steps: privileged: true settings: dockerfile: Dockerfile - platforms: ${platform} dry_run: true repo: *repo auto_tag: true @@ -31,7 +30,6 @@ steps: privileged: true settings: dockerfile: Dockerfile - platforms: ${platform} repo: *repo registry: source.hodakov.me auto_tag: true -- 2.45.2