Merge stage-name-updates into master (#19)

concur · Mar 1, 2018 · 0cd9c0e · 0cd9c0e
1 parent edc1c92
commit 0cd9c0e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Jenkins Workflows
 
+## v0.4.1
+
+### Changed
+
+* docker: Stage names changed to be more simple.
+
 ## v0.4.0
 
 ### Added

diff --git a/docker.groovy b/docker.groovy
@@ -238,15 +238,12 @@ public push(Map yml, Map args) {
  * Set the name of the stage dynamically.
  */
 public getStageName(Map yml, Map args, String stepName) {
-  String buildVersion = concurGit.getVersion(yml)
+  String imageName = args?.imageName ?: yml.tools?.docker?.imageName ?: "${env.GIT_OWNER}/${env.GIT_REPO}"
   switch(stepName) {
     case 'build':
-      def dockerfile = args?.dockerfile ?: yml.tools?.docker?.dockerfile
-      return dockerfile ? "docker: build: $dockerfile": 'docker: build'
+      return dockerfile ? "docker: build: $imageName": 'docker: build'
     case 'push':
-      String imageTag     = args?.imageTag  ?: yml.tools?.docker?.imageTag  ?: buildVersion
-      String imageName    = args?.imageName ?: yml.tools?.docker?.imageName ?: "${env.GIT_OWNER}/${env.GIT_REPO}"
-      return "docker: push: $imageName:$imageTag"
+      return "docker: push: $imageName"
   }
 }