From 40a7a49e4b41d83e832242cad3f2996d1f28f42d Mon Sep 17 00:00:00 2001
From: an <an@noreply.example.org>
Date: Thu, 22 Feb 2018 22:03:11 +0000
Subject: [PATCH] =?UTF-8?q?'.drone.yml'=20=C3=A4ndern?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .drone.yml | 68 ++++++++++++++++++++++++++++++------------------------
 1 file changed, 38 insertions(+), 30 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 559470d..a101e93 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,30 +1,38 @@
-pipeline:
-  build:
-    image: plugins/docker
-    commands:
-      - REV=$(git rev-list HEAD --count)
-      - BUILDDATE=$(date)
-      - BRANCH=$DRONE_COMMIT_BRANCH
-      - VERSIONGO=version.go
-      - echo "Building image $IMAGE:$BRANCH-$REV"
-      - echo  "package main" >$VERSIONGO
-      - echo "" >>$VERSIONGO
-      - echo "const (" >>$VERSIONGO
-      - echo -n "    FlokatiVersion = \"" >>$VERSIONGO
-      - echo -n "$BRANCH" >>$VERSIONGO
-      - echo "\"" >>$VERSIONGO
-      - echo -n "    FlokatiBuild   = \"" >>$VERSIONGO
-      - echo -n "$REV" >>$VERSIONGO
-      - echo "\"" >>$VERSIONGO
-      - echo -n "    FlokatiBuilddate = \"" >>$VERSIONGO
-      - echo -n "$BUILDDATE" >>$VERSIONGO
-      - echo "\"" >>$VERSIONGO
-      - echo ")" >>$VERSIONGO
-      - cat version.go
-      - docker build -t dr.dnix.de/mmflokati:${DRONE_COMMIT_BRANCH}-${REV} .
-      - docker push dr.dnix.de/mmflokati:${DRONE_COMMIT_BRANCH}-${REV}
-  deploy:
-    image: ubuntu:16.04
-    commands:
-      - echo "foo"
-      
\ No newline at end of file
+    pipeline:
+      prebuild:
+        image: golang:1.9
+        environment:
+          - IMAGE=dr.dnix.de/$DRONE_REPO_NAME
+        commands:
+          - REV=$(git rev-list HEAD --count)
+          - BUILDDATE=$(date)
+          - BRANCH=$DRONE_COMMIT_BRANCH
+          - VERSIONGO=version.go
+          - echo "Building image $IMAGE:$BRANCH-$REV"
+          - echo  "package main" >$VERSIONGO
+          - echo "" >>$VERSIONGO
+          - echo "const (" >>$VERSIONGO
+          - echo -n "    FlokatiVersion = \"" >>$VERSIONGO
+          - echo -n "$BRANCH" >>$VERSIONGO
+          - echo "\"" >>$VERSIONGO
+          - echo -n "    FlokatiBuild   = \"" >>$VERSIONGO
+          - echo -n "$REV" >>$VERSIONGO
+          - echo "\"" >>$VERSIONGO
+          - echo -n "    FlokatiBuilddate = \"" >>$VERSIONGO
+          - echo -n "$BUILDDATE" >>$VERSIONGO
+          - echo "\"" >>$VERSIONGO
+          - echo ")" >>$VERSIONGO
+          - cat version.go
+      build_docker:
+        image: plugins/docker
+        environment:
+        commands:
+          - REV=$(git rev-list HEAD --count)
+          - docker build -t dr.dnix.de/mmflokati:latest
+          - docker tag dr.dnix.de/mmflokati:latest dr.dnix.de/mmflokati:${DRONE_COMMIT_BRANCH}-${REV}
+          - docker push dr.dnix.de/mmflokati:latest
+          - docker push dr.dnix.de/mmflokati:${DRONE_COMMIT_BRANCH}-${REV}
+      deploy:
+        image: ubuntu:16.04
+        commands:
+          - echo "foo"