From e6ff59313f44209a82c3e9135e9bae8aa508589e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torma=20Krist=C3=B3f?= <tormakristof@tormakristof.eu>
Date: Tue, 28 Apr 2020 17:39:01 +0200
Subject: [PATCH 1/3] update docker namespace and add teams webhook

---
 .drone.yml | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index eb3f552..567a32e 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -25,10 +25,16 @@ steps:
         from_secret: DOCKER_PASSWORD
   commands:
   - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin registry.kmlabz.com
-  - docker build -t="registry.kmlabz.com/$DOCKER_USERNAME/$DRONE_REPO_NAME" .
-  - docker build -t="registry.kmlabz.com/$DOCKER_USERNAME/$DRONE_REPO_NAME:$DRONE_BUILD_NUMBER" .
-  - docker push "registry.kmlabz.com/$DOCKER_USERNAME/$DRONE_REPO_NAME"
-  - docker push "registry.kmlabz.com/$DOCKER_USERNAME/$DRONE_REPO_NAME:$DRONE_BUILD_NUMBER"
+  - docker build -t="registry.kmlabz.com/birbnetes/$DRONE_REPO_NAME" .
+  - docker build -t="registry.kmlabz.com/birbnetes/$DRONE_REPO_NAME:$DRONE_BUILD_NUMBER" .
+  - docker push "registry.kmlabz.com/birbnetes/$DRONE_REPO_NAME"
+  - docker push "registry.kmlabz.com/birbnetes/$DRONE_REPO_NAME:$DRONE_BUILD_NUMBER"
+
+  notify:
+    image: kuperiu/drone-teams
+    webhook: 
+      from_secret: TEAMS_WEBHOOK
+    when: { status: [ failure ] }
 
 services:
 - name: docker

From 667e5c0985eee6dfb0c918bb2142eebe298513a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torma=20Krist=C3=B3f?= <tormakristof@tormakristof.eu>
Date: Tue, 28 Apr 2020 17:49:14 +0200
Subject: [PATCH 2/3] fix drone lint

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

diff --git a/.drone.yml b/.drone.yml
index 567a32e..5e757dc 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -30,11 +30,13 @@ steps:
   - docker push "registry.kmlabz.com/birbnetes/$DRONE_REPO_NAME"
   - docker push "registry.kmlabz.com/birbnetes/$DRONE_REPO_NAME:$DRONE_BUILD_NUMBER"
 
-  notify:
-    image: kuperiu/drone-teams
+- name: ms-teams
+  image: kuperiu/drone-teams
+  settings:
     webhook: 
       from_secret: TEAMS_WEBHOOK
-    when: { status: [ failure ] }
+  when:
+    status: [ failure ]
 
 services:
 - name: docker

From d26a81acf03b075e94c586611aec803c6fe34faa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torma=20Krist=C3=B3f?= <tormakristof@tormakristof.eu>
Date: Tue, 28 Apr 2020 19:20:37 +0200
Subject: [PATCH 3/3] use kaniko to build container image

---
 .drone.yml | 42 +++++++++++++-----------------------------
 1 file changed, 13 insertions(+), 29 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 5e757dc..f6c28ca 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -4,7 +4,7 @@ name: default
 
 steps:
 - name: static_analysis
-  image: python:3
+  image: "python:3"
   commands:
   - pip3 install pylint bandit mccabe
   - pip3 install -r requirements.txt
@@ -13,22 +13,18 @@ steps:
   - find . -name "*.py" -exec python3 -m mccabe --min 3 '{}' + || if [ $? -eq 1 ]; then echo "you fail"; fi
   - bandit -r . + || if [ $? -eq 1 ]; then echo "you fail"; fi
 
-- name: build
-  image: docker:stable-dind
-  volumes:
-  - name: dockersock
-    path: /var/run
-  environment:
-      DOCKER_USERNAME:
-        from_secret: DOCKER_USERNAME
-      DOCKER_PASSWORD:
-        from_secret: DOCKER_PASSWORD
-  commands:
-  - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin registry.kmlabz.com
-  - docker build -t="registry.kmlabz.com/birbnetes/$DRONE_REPO_NAME" .
-  - docker build -t="registry.kmlabz.com/birbnetes/$DRONE_REPO_NAME:$DRONE_BUILD_NUMBER" .
-  - docker push "registry.kmlabz.com/birbnetes/$DRONE_REPO_NAME"
-  - docker push "registry.kmlabz.com/birbnetes/$DRONE_REPO_NAME:$DRONE_BUILD_NUMBER"
+- name: kaniko
+  image: banzaicloud/drone-kaniko
+  settings:
+    registry: registry.kmlabz.com
+    repo: birbnetes/${DRONE_REPO_NAME}
+    username:
+      from_secret: DOCKER_USERNAME
+    password:
+      from_secret: DOCKER_PASSWORD
+    tags:
+      - latest
+      - ${DRONE_BUILD_NUMBER}
 
 - name: ms-teams
   image: kuperiu/drone-teams
@@ -37,15 +33,3 @@ steps:
       from_secret: TEAMS_WEBHOOK
   when:
     status: [ failure ]
-
-services:
-- name: docker
-  image: docker:stable-dind
-  privileged: true
-  volumes:
-  - name: dockersock
-    path: /var/run
-
-volumes:
-- name: dockersock
-  temp: {}