From 79219eb6e488644e7d92f592145341cf17cfd3a7 Mon Sep 17 00:00:00 2001
From: Mohamed Mansour <mohmans@pm.me>
Date: Mon, 2 Sep 2024 15:02:28 +0300
Subject: [PATCH 1/2] ci(.drone.yml): use the container jsonnet template

---
 .drone.yml | 41 ++++++-----------------------------------
 1 file changed, 6 insertions(+), 35 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 0c011a39..9c23069d 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,37 +1,8 @@
 # Drone CI File!
 
-kind: pipeline
-type: kubernetes
-name: default
-
-metadata:
-  namespace: builds
-
-node_selector:
-  doks.digitalocean.com/node-pool: josa-cloud-np
-
-steps:
-  - name: build
-    image: plugins/docker
-    settings:
-      repo: josaorg/safepass
-      build_args:
-        [
-          MATOMO_URL=https://track.josa.ngo/,
-          MATOMO_SITE_ID=15,
-        ]
-      tags:
-        - ${DRONE_COMMIT_SHA}
-        - stable
-      username:
-        from_secret: docker_username
-      password:
-        from_secret: docker_password
-  - name: notify
-    image: plugins/slack
-    settings:
-      webhook:
-        from_secret: slack_webhook
-      channel: heartbeat
-    depends_on:
-      - build
+kind: template
+load: container.jsonnet
+data:
+  repositoryName: josaorg/safepass
+  releaseName: safepass
+  buildArgs: MATOMO_URL=https://track.josa.ngo/, MATOMO_SITE_ID=15,

From c432aed0d18b1ce354703f29c4ae198122d62b8a Mon Sep 17 00:00:00 2001
From: Mohamed Mansour <mohmans@pm.me>
Date: Mon, 2 Sep 2024 15:05:32 +0300
Subject: [PATCH 2/2] ci(.drone.yml): remove trailing comma

---
 .drone.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.drone.yml b/.drone.yml
index 9c23069d..92e580bf 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -5,4 +5,4 @@ load: container.jsonnet
 data:
   repositoryName: josaorg/safepass
   releaseName: safepass
-  buildArgs: MATOMO_URL=https://track.josa.ngo/, MATOMO_SITE_ID=15,
+  buildArgs: MATOMO_URL=https://track.josa.ngo/, MATOMO_SITE_ID=15