From be806166b49af76fb6e4fafe3f65c578a9b4e0f2 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Wed, 21 Feb 2024 18:45:28 +0100 Subject: [PATCH 1/3] ci: use woodpeckerci/plugin-docker-buildx --- .woodpecker.yml | 112 +++++++++++++++++++++++++----------------------- 1 file changed, 59 insertions(+), 53 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index fe969a1..df24501 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -1,63 +1,69 @@ steps: - dep: - image: deblan/php:8.2 + "Install dependencies": + image: deblan/php:8.3 commands: - composer install when: event: [push] - build_push_latest_gitnet: - image: plugins/docker - secrets: [registry_user, registry_password] + "Docker build and push": + image: woodpeckerci/plugin-docker-buildx + repo: gitnet.fr/deblan/woodpecker-email,deblan/woodpecker-email settings: - registry: gitnet.fr + logins: + - registry: https://gitnet.fr + username: + from_secret: registry_user + password: + from_secret: registry_password + - registry: https://index.docker.io/v1/ + username: + from_secret: registry_user + password: + from_secret: registry_docker_password repo: gitnet.fr/${CI_REPO} - tags: latest - username: - from_secret: registry_user - password: - from_secret: registry_password - when: - branch: [master] - event: [push] + tags: test + # when: + # branch: [master] + # event: [push] - build_push_tag_gitnet: - image: plugins/docker - secrets: [registry_user, registry_password] - settings: - registry: gitnet.fr - repo: gitnet.fr/${CI_REPO} - tags: ${CI_COMMIT_TAG} - username: - from_secret: registry_user - password: - from_secret: registry_password - when: - event: [tag] + # build_push_tag_gitnet: + # image: plugins/docker + # secrets: [registry_user, registry_password] + # settings: + # registry: gitnet.fr + # repo: gitnet.fr/${CI_REPO} + # tags: ${CI_COMMIT_TAG} + # username: + # from_secret: registry_user + # password: + # from_secret: registry_password + # when: + # event: [tag] - build_push_latest_dhub: - image: plugins/docker - secrets: [registry_user, registry_docker_password] - settings: - repo: ${CI_REPO} - tags: latest - username: - from_secret: registry_user - password: - from_secret: registry_docker_password - when: - branch: [master] - event: [push] - - build_push_tag_dhub: - image: plugins/docker - secrets: [registry_user, registry_docker_password] - settings: - repo: ${CI_REPO} - tags: ${CI_COMMIT_TAG} - username: - from_secret: registry_user - password: - from_secret: registry_docker_password - when: - event: [tag] + # build_push_latest_dhub: + # image: plugins/docker + # secrets: [registry_user, registry_docker_password] + # settings: + # repo: ${CI_REPO} + # tags: latest + # username: + # from_secret: registry_user + # password: + # from_secret: registry_docker_password + # when: + # branch: [master] + # event: [push] + # + # build_push_tag_dhub: + # image: plugins/docker + # secrets: [registry_user, registry_docker_password] + # settings: + # repo: ${CI_REPO} + # tags: ${CI_COMMIT_TAG} + # username: + # from_secret: registry_user + # password: + # from_secret: registry_docker_password + # when: + # event: [tag] From 82cd91641e7c5fc3fe6ea6c55672e958042c8a1a Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Wed, 21 Feb 2024 18:48:22 +0100 Subject: [PATCH 2/3] ci: use woodpeckerci/plugin-docker-buildx --- .woodpecker.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index df24501..4bfdc4b 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -8,8 +8,8 @@ steps: "Docker build and push": image: woodpeckerci/plugin-docker-buildx - repo: gitnet.fr/deblan/woodpecker-email,deblan/woodpecker-email settings: + repo: gitnet.fr/deblan/woodpecker-email,deblan/woodpecker-email logins: - registry: https://gitnet.fr username: @@ -21,7 +21,6 @@ steps: from_secret: registry_user password: from_secret: registry_docker_password - repo: gitnet.fr/${CI_REPO} tags: test # when: # branch: [master] From 2ecafbe733f859665c58359b5fb74ce53636024e Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Wed, 21 Feb 2024 18:54:00 +0100 Subject: [PATCH 3/3] ci: refactor steps --- .woodpecker.yml | 61 ++++++++----------------------------------------- 1 file changed, 10 insertions(+), 51 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 4bfdc4b..494e7fc 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -1,15 +1,15 @@ steps: - "Install dependencies": - image: deblan/php:8.3 - commands: - - composer install - when: - event: [push] + "Test docker build": + image: woodpeckerci/plugin-docker-buildx + settings: + repo: gitnet.fr/deblan/woodpecker-email + dry-run: true "Docker build and push": image: woodpeckerci/plugin-docker-buildx settings: repo: gitnet.fr/deblan/woodpecker-email,deblan/woodpecker-email + tags: ${CI_COMMIT_TAG=latest} logins: - registry: https://gitnet.fr username: @@ -21,48 +21,7 @@ steps: from_secret: registry_user password: from_secret: registry_docker_password - tags: test - # when: - # branch: [master] - # event: [push] - - # build_push_tag_gitnet: - # image: plugins/docker - # secrets: [registry_user, registry_password] - # settings: - # registry: gitnet.fr - # repo: gitnet.fr/${CI_REPO} - # tags: ${CI_COMMIT_TAG} - # username: - # from_secret: registry_user - # password: - # from_secret: registry_password - # when: - # event: [tag] - - # build_push_latest_dhub: - # image: plugins/docker - # secrets: [registry_user, registry_docker_password] - # settings: - # repo: ${CI_REPO} - # tags: latest - # username: - # from_secret: registry_user - # password: - # from_secret: registry_docker_password - # when: - # branch: [master] - # event: [push] - # - # build_push_tag_dhub: - # image: plugins/docker - # secrets: [registry_user, registry_docker_password] - # settings: - # repo: ${CI_REPO} - # tags: ${CI_COMMIT_TAG} - # username: - # from_secret: registry_user - # password: - # from_secret: registry_docker_password - # when: - # event: [tag] + when: + - branch: [master] + event: [push] + - event: [tag]