From da23e64839e4797dae2d90d0f83420df079e7c6e Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Thu, 12 Jan 2023 10:51:24 +0100 Subject: [PATCH] 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