From 7baa5df8eb49a1f502deb8edcaaad532788f531b Mon Sep 17 00:00:00 2001
From: Michael Grote <michael.grote@posteo.de>
Date: Sat, 6 Aug 2022 20:25:45 +0200
Subject: [PATCH] Doku + Org-Secrets

---
 .drone.yml | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index abd5e39..c5caf11 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -7,30 +7,24 @@ steps:
     image: plugins/gitleaks
     settings:
       path: .
-  # https://github.com/hadolint/hadolint/blob/master/docs/INTEGRATION.md
-#  - name: hadolint
-#    image: hadolint/hadolint:latest-debian
-#    # image: ghcr.io/hadolint/hadolint:latest-debian
-#    commands:
-#      - hadolint --version
-#      - hadolint  Dockerfile
+
+  - name: hadolint
+    image: hadolint/hadolint:latest-debian
+    commands:
+      - hadolint --version
+      - hadolint  Dockerfile
+
   - name: docker_build_and_push
     image: plugins/docker
     environment:
       http_proxy: http://acng.grote.lan:9999
     settings:
-      # Dockerhub-Username
-      username: quotengrote
-      # Dockerhub-Password
-      # als Org-Secret hinterlegt
+      username:
+        from_secret: DOCKERHUB_USER
       password:
         from_secret: DOCKERHUB_PASS
-      # Container-Registry
-      # registry: hub.docker.com
-      # Name des Containerfiles
       dockerfile: Dockerfile
-      # Repo auf dem Dockerhub
-      repo: quotengrote/munin-server
+      repo: quotengrote/fpm
       tags:
         - latest
         - ${DRONE_COMMIT_SHA:0:8}