lib/vidar/cli.rb in vidar-1.8.0 vs lib/vidar/cli.rb in vidar-1.9.0

@@ -21,13 +21,13 @@
 
     desc "pull", "Pull existing docker images to leverage docker caching"
     def pull
       Log.info "Pulling #{Config.get!(:image)} tags"
       Run.docker "pull #{Config.get!(:image)}:#{Config.get!(:base_stage_name)}-#{Config.get!(:current_branch)} 2> /dev/null || true"
-      Run.docker "pull #{Config.get!(:image)}:#{Config.get!(:base_stage_name)}-#{Config.get!(:default_branch)} 2> /dev/null || true"
-      Run.docker "pull #{Config.get!(:image)}:#{Config.get!(:base_stage_name)} 2> /dev/null || true"
-      Run.docker "pull #{Config.get!(:image)}:#{Config.get!(:release_stage_name)} 2> /dev/null || true"
+      unless Config.default_branch?
+        Run.docker "pull #{Config.get!(:image)}:#{Config.get!(:base_stage_name)}-#{Config.get!(:default_branch)} 2> /dev/null || true"
+      end
       Log.info "Docker images:"
       Run.docker("images")
     end
 
     desc "build", "Build docker stages"
@@ -45,23 +45,21 @@
       Run.docker "push #{Config.get!(:image)}:#{Config.get!(:base_stage_name)}-#{Config.get!(:current_branch)}"
     end
 
     desc "publish", "Publish docker images on docker registry"
     def publish
-      base_image_tag = "#{Config.get!(:image)}:#{Config.get!(:base_stage_name)}"
       revision_image_tag = "#{Config.get!(:image)}:#{Config.get!(:revision)}"
       release_image_tag = "#{Config.get!(:image)}:#{Config.get!(:release_stage_name)}"
       latest_image_tag = "#{Config.get!(:image)}:latest"
 
       Log.info "Publishing #{revision_image_tag}"
       Run.docker "tag #{release_image_tag} #{revision_image_tag}"
       Run.docker "push #{revision_image_tag}"
 
       return unless Config.default_branch?
 
-      Log.info "Publishing #{base_image_tag}"
-      Run.docker "tag #{base_image_tag}-#{Config.get!(:current_branch)} #{base_image_tag}"
-      Run.docker "push #{base_image_tag}"
+      Log.info "Publishing #{Config.get!(:base_stage_name)} image"
+      Run.docker "push #{Config.get!(:image)}:#{Config.get!(:base_stage_name)}-#{Config.get!(:current_branch)}"
 
       Log.info "Publishing #{release_image_tag}"
       Run.docker "tag #{release_image_tag} #{latest_image_tag}"
       Run.docker "push #{release_image_tag}"
       Run.docker "push #{latest_image_tag}"