From 477af59b84ebf1abc12040caf70a4af04f52deb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torma=20Krist=C3=B3f?= Date: Tue, 28 Apr 2020 17:37:39 +0200 Subject: [PATCH 1/6] add teams webhook --- .drone.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.drone.yml b/.drone.yml index eb3f552..b3d098f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -30,6 +30,12 @@ steps: - docker push "registry.kmlabz.com/$DOCKER_USERNAME/$DRONE_REPO_NAME" - docker push "registry.kmlabz.com/$DOCKER_USERNAME/$DRONE_REPO_NAME:$DRONE_BUILD_NUMBER" + notify: + image: kuperiu/drone-teams + webhook: + from_secret: TEAMS_WEBHOOK + when: { status: [ failure ] } + services: - name: docker image: docker:stable-dind From 84352398206e5ddc2064e7183f96140b158263bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torma=20Krist=C3=B3f?= Date: Tue, 28 Apr 2020 17:38:13 +0200 Subject: [PATCH 2/6] update docker namespace --- .drone.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index b3d098f..567a32e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -25,10 +25,10 @@ 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 From 094df6289f237c7acbcff1444b1455ac3ff39eda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torma=20Krist=C3=B3f?= Date: Tue, 28 Apr 2020 17:49:26 +0200 Subject: [PATCH 3/6] Update '.drone.yml' --- .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 a2966472bd48acbcba8143ea634bd3527553011b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torma=20Krist=C3=B3f?= Date: Tue, 28 Apr 2020 19:09:12 +0200 Subject: [PATCH 4/6] use kaniko to build container image --- .drone.yml | 39 ++++++++++----------------------------- 1 file changed, 10 insertions(+), 29 deletions(-) diff --git a/.drone.yml b/.drone.yml index 5e757dc..6f7d870 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,15 @@ 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: registry.kmlabz.com/birbnetes/${DRONE_REPO_NAME} + username: + from_secret: DOCKER_USERNAME + password: + from_secret: DOCKER_PASSWORD - name: ms-teams image: kuperiu/drone-teams @@ -37,15 +30,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: {} From bd44a448a3ee5ceeb9ba6f67b93e02f308cd47b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torma=20Krist=C3=B3f?= Date: Tue, 28 Apr 2020 19:11:28 +0200 Subject: [PATCH 5/6] tag builds in kaniko --- .drone.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.drone.yml b/.drone.yml index 6f7d870..3a90c19 100644 --- a/.drone.yml +++ b/.drone.yml @@ -22,6 +22,9 @@ steps: from_secret: DOCKER_USERNAME password: from_secret: DOCKER_PASSWORD + tags: + - latest + - ${DRONE_BUILD_NUMBER} - name: ms-teams image: kuperiu/drone-teams From e1fcfe670f4fa1b2dd8ccf31fe82401ff5bee2d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torma=20Krist=C3=B3f?= Date: Tue, 28 Apr 2020 19:16:23 +0200 Subject: [PATCH 6/6] fix image namespace --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 3a90c19..f6c28ca 100644 --- a/.drone.yml +++ b/.drone.yml @@ -17,7 +17,7 @@ steps: image: banzaicloud/drone-kaniko settings: registry: registry.kmlabz.com - repo: registry.kmlabz.com/birbnetes/${DRONE_REPO_NAME} + repo: birbnetes/${DRONE_REPO_NAME} username: from_secret: DOCKER_USERNAME password: