From 61fc01f27ddbb807f066715d9a2cc5bfee3ea345 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Tue, 26 Dec 2023 17:34:01 +0100
Subject: [PATCH 1/3] ci: build with kaniko

---
 .woodpecker/.build.yml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/.woodpecker/.build.yml b/.woodpecker/.build.yml
index 635d11a..657a37d 100644
--- a/.woodpecker/.build.yml
+++ b/.woodpecker/.build.yml
@@ -10,15 +10,17 @@ matrix:
 
 steps:
   docker:
-    image: docker:dind
+    image: gcr.io/kaniko-project/executor:latest
     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
-      - 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"
+      # - echo "$REGISTRY_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"
+      # - docker push "deblan/php:$PHP_VERSION"
+      - /kaniko/executor --no-push --context $CI_WORKSPACE --dockerfile "./Dockerfile.php$PHP_VERSION" --destination "gitnet.fr/deblan/php:$PHP_VERSION"
+      - /kaniko/executor --no-push --context $CI_WORKSPACE --dockerfile "./Dockerfile.php$PHP_VERSION" --destination "deblan/php:$PHP_VERSION"
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
     when:

From 2bcf2fa4db1cfafd3fe7b4eed4cb47e536fcef38 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Tue, 26 Dec 2023 17:35:53 +0100
Subject: [PATCH 2/3] ci: build with kaniko

---
 .woodpecker/.build.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.woodpecker/.build.yml b/.woodpecker/.build.yml
index 657a37d..619156f 100644
--- a/.woodpecker/.build.yml
+++ b/.woodpecker/.build.yml
@@ -25,7 +25,8 @@ steps:
       - /var/run/docker.sock:/var/run/docker.sock
     when:
       - event: cron
-      - branch: [master]
+      - branch: [feature/kaniko]
+      #- branch: [master]
 
   mail:
     image: deblan/woodpecker-email

From d5468a5bb9666ef5bd06e38c4a0e87607c89ed22 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Tue, 26 Dec 2023 17:42:59 +0100
Subject: [PATCH 3/3] ci: build with kaniko

---
 .woodpecker/.build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.woodpecker/.build.yml b/.woodpecker/.build.yml
index 619156f..28432b8 100644
--- a/.woodpecker/.build.yml
+++ b/.woodpecker/.build.yml
@@ -10,7 +10,7 @@ matrix:
 
 steps:
   docker:
-    image: gcr.io/kaniko-project/executor:latest
+    image: gcr.io/kaniko-project/executor:debug
     secrets: [registry_user, registry_password, registry_docker_password]
     commands:
       # - echo "$REGISTRY_PASSWORD" | docker login -u "$REGISTRY_USER" --password-stdin gitnet.fr