From ca32c5a041d9d0c8fc397acda401d03fd7729698 Mon Sep 17 00:00:00 2001
From: Timo Behrendt <t.behrendt@t00n.de>
Date: Wed, 20 Sep 2023 21:58:23 +0200
Subject: [PATCH 1/2] feat: add trigger to pipeline

---
 .drone.yaml | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/.drone.yaml b/.drone.yaml
index 48f26e0..45da76e 100644
--- a/.drone.yaml
+++ b/.drone.yaml
@@ -3,6 +3,12 @@ type: docker
 
 name: build-and-push-container
 
+triggers:
+  branch:
+    - main
+  event:
+    - push
+
 steps:
   - name: build
     image: docker:20
@@ -10,11 +16,6 @@ steps:
       - COMMIT_HASH=$(git rev-parse --short HEAD)
       - IMAGE_TAG=gitea.t000-n.de/t.behrendt/backupsidecar:$COMMIT_HASH
       - docker build -t $IMAGE_TAG .
-    when:
-      event:
-        - push
-      ref:
-        - refs/heads/main
 
   - name: push
     image: plugins/docker
@@ -27,8 +28,3 @@ steps:
       tags: 
         - latest
         - $COMMIT_HASH
-    when:
-      event:
-        - push
-      ref:
-        - refs/heads/main

From b05f5079939ce98f4bd332c5fe6692fc190a3fdf Mon Sep 17 00:00:00 2001
From: Timo Behrendt <t.behrendt@t00n.de>
Date: Wed, 20 Sep 2023 22:02:33 +0200
Subject: [PATCH 2/2] feat: add commit hash to image tag

---
 .drone.yaml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/.drone.yaml b/.drone.yaml
index 45da76e..43bcb01 100644
--- a/.drone.yaml
+++ b/.drone.yaml
@@ -11,11 +11,9 @@ triggers:
 
 steps:
   - name: build
-    image: docker:20
+    image: plugins/docker
     commands:
-      - COMMIT_HASH=$(git rev-parse --short HEAD)
-      - IMAGE_TAG=gitea.t000-n.de/t.behrendt/backupsidecar:$COMMIT_HASH
-      - docker build -t $IMAGE_TAG .
+      - docker build -t gitea.t000-n.de/t.behrendt/backupsidecar:${DRONE_COMMIT:0:8} .
 
   - name: push
     image: plugins/docker
@@ -27,4 +25,4 @@ steps:
       repo: gitea.t000-n.de/t.behrendt/backupsidecar
       tags: 
         - latest
-        - $COMMIT_HASH
+        - ${DRONE_COMMIT:0:8}