Merge pull request #19 from carlossg/JENKINS-27970

[JENKINS-27970] Build doesn't fail even if docker build does
jenkinsci · Apr 21, 2015 · cf6e4a2 · cf6e4a2
2 parents 9bf9e37 + 61e6597
commit cf6e4a2
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/java/com/cloudbees/dockerpublish/DockerBuilder.java b/src/main/java/com/cloudbees/dockerpublish/DockerBuilder.java
@@ -128,8 +128,8 @@ private boolean exec() {
 
                 return
                     maybeLogin() &&
-                    isSkipBuild() ? maybeTagOnly() : buildAndTag() &&
-                    isSkipPush() ? true : dockerPushCommand();
+                    (isSkipBuild() ? maybeTagOnly() : buildAndTag()) &&
+                    (isSkipPush() ? true : dockerPushCommand());
 
             } catch (IOException e) {
                 return recordException(e);