From c68591eb6356dbf90184f934764c8043627d0843 Mon Sep 17 00:00:00 2001
From: oonyeje <oonyeje@bsidesol.com>
Date: Sun, 23 Feb 2025 16:50:08 -0500
Subject: [PATCH] - add user details as env vars

---
 .drone.yml | 76 +++++++++++++++++++++++++++++++++---------------------
 1 file changed, 46 insertions(+), 30 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index a5b950e..7f1b20d 100755
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,29 +1,29 @@
 kind: pipeline
 type: docker
 name: build
-environment:
-  SMTP_PROXY_EMAIL:
-    from_secret: SMTP_PROXY_EMAIL
-  SMTP_RECIPIENT_EMAIL:
-    from_secret: SMTP_RECIPIENT_EMAIL
-  SMTP_HOST:
-    from_secret: SMTP_HOST
-  SMTP_PORT:
-    from_secret: SMTP_PORT
-  SMTP_USERNAME:
-    from_secret: SMTP_USERNAME
-  SMTP_PASSWORD:
-    from_secret: SMTP_PASSWORD
-  NEXT_PUBLIC_GOOGLE_APPOINTMENTS_LINK:
-    from_secret: NEXT_PUBLIC_GOOGLE_APPOINTMENTS_LINK
-  RECAPTCHA_SECRET_KEY:
-    from_secret: RECAPTCHA_SECRET_KEY
-  NEXT_PUBLIC_RECAPTCHA_SITE_KEY:
-    from_secret: NEXT_PUBLIC_RECAPTCHA_SITE_KEY
 
 steps:
 - name: build
   image: docker/compose:latest
+  environment:
+    SMTP_PROXY_EMAIL:
+      from_secret: SMTP_PROXY_EMAIL
+    SMTP_RECIPIENT_EMAIL:
+      from_secret: SMTP_RECIPIENT_EMAIL
+    SMTP_HOST:
+      from_secret: SMTP_HOST
+    SMTP_PORT:
+      from_secret: SMTP_PORT
+    SMTP_USERNAME:
+      from_secret: SMTP_USERNAME
+    SMTP_PASSWORD:
+      from_secret: SMTP_PASSWORD
+    NEXT_PUBLIC_GOOGLE_APPOINTMENTS_LINK:
+      from_secret: NEXT_PUBLIC_GOOGLE_APPOINTMENTS_LINK
+    RECAPTCHA_SECRET_KEY:
+      from_secret: RECAPTCHA_SECRET_KEY
+    NEXT_PUBLIC_RECAPTCHA_SITE_KEY:
+      from_secret: NEXT_PUBLIC_RECAPTCHA_SITE_KEY
   volumes:
   - name: docker_sock
     path: /var/run/docker.sock
@@ -32,15 +32,32 @@ steps:
   - docker tag oonyeje-portfolio gitea.bsidesolutions.net/oonyeje/oonyeje-portfolio:latest
 - name: push-image
   image: docker/compose:latest
+  environment:
+    SMTP_PROXY_EMAIL:
+      from_secret: SMTP_PROXY_EMAIL
+    SMTP_RECIPIENT_EMAIL:
+      from_secret: SMTP_RECIPIENT_EMAIL
+    SMTP_HOST:
+      from_secret: SMTP_HOST
+    SMTP_PORT:
+      from_secret: SMTP_PORT
+    SMTP_USERNAME:
+      from_secret: SMTP_USERNAME
+    SMTP_PASSWORD:
+      from_secret: SMTP_PASSWORD
+    NEXT_PUBLIC_GOOGLE_APPOINTMENTS_LINK:
+      from_secret: NEXT_PUBLIC_GOOGLE_APPOINTMENTS_LINK
+    RECAPTCHA_SECRET_KEY:
+      from_secret: RECAPTCHA_SECRET_KEY
+    NEXT_PUBLIC_RECAPTCHA_SITE_KEY:
+      from_secret: NEXT_PUBLIC_RECAPTCHA_SITE_KEY
+    DOCKER_REGISTRY_USER:
+      from_secret: DOCKER_USERNAME
+    DOCKER_REGISTRY_PASS:
+      from_secret: DOCKER_PASSWORD
   volumes:
   - name: docker_sock
     path: /var/run/docker.sock
-  settings:
-    registry: gitea.bsidesolutions.net
-    username:
-      from_secret: DOCKER_USERNAME
-    password:
-      from_secret: DOCKER_PASSWORD
   commands:
   - docker-compose -f ./docker-compose.drone.yaml push
 
@@ -91,8 +108,7 @@ steps:
 #   event:
 #   - push
 #   - pull_request
-
-volumes:
-  - name: docker_sock
-    host:
-      path: /var/run/docker.sock
\ No newline at end of file
+# volumes:
+#   - name: docker_sock
+#     host:
+#       path: /var/run/docker.sock
\ No newline at end of file