From 1ee5b8aea64fe22939580cd6be22c573b7fc3ac0 Mon Sep 17 00:00:00 2001
From: Robert Kaussow <robert.kaussow@mail.schwarz>
Date: Mon, 18 Mar 2019 14:49:39 +0100
Subject: [PATCH] fix some naming errors

---
 .drone.jsonnet | 13 +++++++------
 .drone.yml     |  6 +++---
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.drone.jsonnet b/.drone.jsonnet
index 6cdb584..b36d93b 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -1,8 +1,9 @@
 local PipelineBuild(os='linux', arch='amd64', version='gce') = {
-  local tag = version + '-' + os + '-' + arch,
-  local file_suffix = std.strReplace(tag, '-', '.'),
+  local tag = os + '-' + arch,
+  local version_tag = version + '-' + os + '-' + arch,
+  local file_suffix = std.strReplace(version_tag, '-', '.'),
   kind: "pipeline",
-  name: tag,
+  name: version_tag,
   platform: {
     os: os,
     arch: arch,
@@ -14,7 +15,7 @@ local PipelineBuild(os='linux', arch='amd64', version='gce') = {
       pull: 'always',
       settings: {
         dry_run: true,
-        tags: tag,
+        tags: version_tag,
         dockerfile: 'docker/Dockerfile.' + file_suffix,
         repo: ' xoxys/molecule',
         username: { from_secret: "docker_username" },
@@ -27,7 +28,7 @@ local PipelineBuild(os='linux', arch='amd64', version='gce') = {
       pull: 'always',
       settings: {
         auto_tag: true,
-        auto_tag_suffix: tag,
+        auto_tag_suffix: version_tag,
         dockerfile: 'docker/Dockerfile.' + file_suffix,
         repo: ' xoxys/molecule',
         username: { from_secret: "docker_username" },
@@ -95,6 +96,6 @@ local PipelineNotifications(depends_on=[]) = {
 [
   PipelineBuild(os='linux', arch='amd64', version='gce'),
   PipelineNotifications(depends_on=[
-    "linux-amd64"
+    "gce-linux-amd64"
   ])
 ]
diff --git a/.drone.yml b/.drone.yml
index 84cc826..c39ffb1 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -9,7 +9,7 @@ platform:
 steps:
 - name: dryrun
   pull: always
-  image: plugins/docker:gce-linux-amd64
+  image: plugins/docker:linux-amd64
   settings:
     dockerfile: docker/Dockerfile.gce.linux.amd64
     dry_run: true
@@ -22,7 +22,7 @@ steps:
 
 - name: publish
   pull: always
-  image: plugins/docker:gce-linux-amd64
+  image: plugins/docker:linux-amd64
   settings:
     auto_tag: true
     auto_tag_suffix: gce-linux-amd64
@@ -88,6 +88,6 @@ trigger:
   - failure
 
 depends_on:
-- linux-amd64
+- gce-linux-amd64
 
 ...