From da23e64839e4797dae2d90d0f83420df079e7c6e Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Thu, 12 Jan 2023 10:51:24 +0100 Subject: [PATCH 1/5] ci(build): remove on build per image --- .woodpecker.yml | 34 ++++++++++------------------------ 1 file changed, 10 insertions(+), 24 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 43facdf..ebb8d14 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -7,30 +7,16 @@ matrix: - 7.1 pipeline: - build_gitnet: - image: plugins/docker - secrets: [registry_user, registry_password] - settings: - registry: gitnet.fr - dockerfile: ./Dockerfile.php${PHP_VERSION} - repo: gitnet.fr/${CI_REPO/docker-/} - tags: ${PHP_VERSION} - username: - from_secret: registry_user - password: - from_secret: registry_password - - build_hub: - image: plugins/docker - secrets: [registry_user, registry_docker_password] - settings: - dockerfile: ./Dockerfile.php${PHP_VERSION} - repo: ${CI_REPO/docker-/} - tags: ${PHP_VERSION} - username: - from_secret: registry_user - password: - from_secret: registry_docker_password + docker: + image: docker:dind + secrets: [registry_user, registry_password, registry_docker_password] + commands: + - echo "$REGISTRY_PASSWORD" | docker -u "$REGISTRY_USER" --password-stdin gitnet.fr + - echo "$REGISTRY_DOCKER_PASSWORD" | docker -u "$REGISTRY_USER" --password-stdin gitnet.fr + - docker build -t "deblan/php:$PHP_VERSION" -f "./Dockerfile.php$PHP_VERSION" . + - docker tag "deblan/php:$PHP_VERSION" "gitnet.fr/deblan/php:$PHP_VERSION" + - docker push "gitnet.fr/deblan/php:$PHP_VERSION" + - docker push "deblan/php:$PHP_VERSION" mail: image: deblan/woodpecker-email From c12443f61eae0b38eb855a840eeb6853827ea90a Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Thu, 12 Jan 2023 10:53:09 +0100 Subject: [PATCH 2/5] fix(ci): docker login --- .woodpecker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index ebb8d14..ab99739 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -11,8 +11,8 @@ pipeline: image: docker:dind secrets: [registry_user, registry_password, registry_docker_password] commands: - - echo "$REGISTRY_PASSWORD" | docker -u "$REGISTRY_USER" --password-stdin gitnet.fr - - echo "$REGISTRY_DOCKER_PASSWORD" | docker -u "$REGISTRY_USER" --password-stdin gitnet.fr + - echo "$REGISTRY_PASSWORD" | docker login -u "$REGISTRY_USER" --password-stdin gitnet.fr + - echo "$REGISTRY_DOCKER_PASSWORD" | docker login -u "$REGISTRY_USER" --password-stdin gitnet.fr - docker build -t "deblan/php:$PHP_VERSION" -f "./Dockerfile.php$PHP_VERSION" . - docker tag "deblan/php:$PHP_VERSION" "gitnet.fr/deblan/php:$PHP_VERSION" - docker push "gitnet.fr/deblan/php:$PHP_VERSION" From 7477346e28cea71102ef07800033ac1fdb017731 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Thu, 12 Jan 2023 10:54:06 +0100 Subject: [PATCH 3/5] fix(ci): docker login --- .woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index ab99739..f030f9d 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -12,7 +12,7 @@ pipeline: secrets: [registry_user, registry_password, registry_docker_password] commands: - echo "$REGISTRY_PASSWORD" | docker login -u "$REGISTRY_USER" --password-stdin gitnet.fr - - echo "$REGISTRY_DOCKER_PASSWORD" | docker login -u "$REGISTRY_USER" --password-stdin gitnet.fr + - echo "$REGISTRY_DOCKER_PASSWORD" | docker login -u "$REGISTRY_USER" --password-stdin - docker build -t "deblan/php:$PHP_VERSION" -f "./Dockerfile.php$PHP_VERSION" . - docker tag "deblan/php:$PHP_VERSION" "gitnet.fr/deblan/php:$PHP_VERSION" - docker push "gitnet.fr/deblan/php:$PHP_VERSION" From 45f8533ff06f37a836ce5d6acd9321eb8e54f9f2 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Thu, 12 Jan 2023 10:54:06 +0100 Subject: [PATCH 4/5] fix(ci): docker login --- .woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index ab99739..f030f9d 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -12,7 +12,7 @@ pipeline: secrets: [registry_user, registry_password, registry_docker_password] commands: - echo "$REGISTRY_PASSWORD" | docker login -u "$REGISTRY_USER" --password-stdin gitnet.fr - - echo "$REGISTRY_DOCKER_PASSWORD" | docker login -u "$REGISTRY_USER" --password-stdin gitnet.fr + - echo "$REGISTRY_DOCKER_PASSWORD" | docker login -u "$REGISTRY_USER" --password-stdin - docker build -t "deblan/php:$PHP_VERSION" -f "./Dockerfile.php$PHP_VERSION" . - docker tag "deblan/php:$PHP_VERSION" "gitnet.fr/deblan/php:$PHP_VERSION" - docker push "gitnet.fr/deblan/php:$PHP_VERSION" From e84cc292dac7b00453b3762e094f9d2ee95d821b Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Thu, 12 Jan 2023 10:56:36 +0100 Subject: [PATCH 5/5] fix(ci): add docker.sock volume --- .woodpecker.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.woodpecker.yml b/.woodpecker.yml index f030f9d..6d9b206 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -17,6 +17,8 @@ pipeline: - docker tag "deblan/php:$PHP_VERSION" "gitnet.fr/deblan/php:$PHP_VERSION" - docker push "gitnet.fr/deblan/php:$PHP_VERSION" - docker push "deblan/php:$PHP_VERSION" + volumes: + - /var/run/docker.sock:/var/run/docker.sock mail: image: deblan/woodpecker-email