.drone.yml

@@ -40,8 +40,30 @@ steps:
   volumes:
   - name: docker_sock
     path: /var/run/docker.sock
-- name: Build and Push Container Image 
+- name: Build and Push (PR) Container Image 
   image: plugins/docker
+  when:
+    branch:
+    - feature/*
+    pull_request:
+      types: [opened, updated]
+  settings:
+    username:
+      from_secret: DOCKER_USERNAME
+    password:
+      from_secret: DOCKER_PASSWORD
+    repo: gitea.bsidesolutions.net/oonyeje/oonyeje-portfolio
+    registry: gitea.bsidesolutions.net
+    dockerfile: ./Dockerfile
+    force_tag: true
+    tags:
+    - latest
+    - pr-build-${DRONE_COMMIT_SHA:0:10}
+- name: Build and Push (Staging) Container Image 
+  image: plugins/docker
+  when:
+    branch:
+    - develop
   settings:
     username:
       from_secret: DOCKER_USERNAME
@@ -54,8 +76,34 @@ steps:
     tags:
     - latest
     - dev
-    - dev-build-${DRONE_COMMIT_SHA:0:7}
+    - dev-${DRONE_COMMIT_SHA:0:10}
-
+- name: Build and Push (Production) Container Image 
+  image: plugins/docker
+  when:
+    branch:
+    - main
+  settings:
+    username:
+      from_secret: DOCKER_USERNAME
+    password:
+      from_secret: DOCKER_PASSWORD
+    repo: gitea.bsidesolutions.net/oonyeje/oonyeje-portfolio
+    registry: gitea.bsidesolutions.net
+    dockerfile: ./Dockerfile
+    force_tag: true
+    tags:
+    - latest
+    - release
+    - release-${DRONE_COMMIT_SHA:0:10}
+trigger:
+   branch:
+   - main
+   - develop
+   - feature/*
+   event:
+    include:
+    - pull_request
+    - push
 
 # - name: deploy-staging
 #   image: plugins/ansible:latest

.gitea/workflows/manual_deploy_to_coolify.yaml

@@ -24,10 +24,6 @@ jobs:
       - name: Checkout Code
         uses: actions/checkout@v4
 
-      # - name: Login to Gitea
-      #   run: |
-      #     echo "${{ secrets.TOKEN }}" | docker login ${{ gitea.server_url }} --username ${{ gitea.actor }} --password-stdin
-
       - name: Deploy to Coolify
         uses: carlozanella/deploy-coolify@v1
         with: