build multiple image tags (#3)

* build multiple image tags

* update README

README.md

@@ -36,11 +36,11 @@ cached-docker help
 
 | Alias | Flag                 | Description                                                           | Default              |
 | ----- | -------------------- | --------------------------------------------------------------------- | -------------------- |
-| -i    | --image-name         | Image name without tag                                                |                      |
+| -i    | --image-name         | Image name without tag or image names separated by comma              |                      |
 | -t    | --image-tag          | Image tag                                                             | Time in unix seconds |
 |       | --build-params       | Add any docker build flag, --build-params="--build-arg=TOKEN=\$TOKEN" |                      |
 | -f    | --file               | Name of the Dockerfile                                                | 'PATH/Dockerfile'    |
-|       | --cache-stage-target | Name of the stage target for use in cache.                            |                      |
+|       | --cache-stage-target | Name of the stage target for use in cache. default first stage        |                      |
 |       | --print              | Only print docker commands                                            | false                |
 | -v    | --version            | Version                                                               |                      |
 | -h    | --help               | Help for this command.                                                | false                |

spec/cached_docker/app_spec.cr

@@ -3,7 +3,7 @@ require "../spec_helper"
 describe CachedDocker::App do
   it "#commands" do
     subject = CachedDocker::App.new(
-      image_name: "crystal-dev",
+      image_names: ["crystal-dev"],
       image_tag: "v1",
     )
     subject.commands.should eq([
@@ -19,7 +19,7 @@ describe CachedDocker::App do
 
   it "#initialize set default values" do
     subject = CachedDocker::App.new(
-      image_name: "crystal-dev",
+      image_names: ["crystal-dev"],
       image_tag: "",
       build_params: "--build-arg=NPM_TOKEN=1234",
       dockerfile_path: "Dockerfile"
@@ -31,7 +31,7 @@ describe CachedDocker::App do
 
   it "#commands" do
     subject = CachedDocker::App.new(
-      image_name: "crystal-dev",
+      image_names: ["crystal-dev"],
       image_tag: "v1",
       build_params: "--build-arg=NPM_TOKEN=1234",
       dockerfile_path: "Dockerfile"

spec/cached_docker/multi_stage_spec.cr

@@ -2,9 +2,11 @@ require "../spec_helper"
 
 class Dummy
   include CachedDocker::CachedStages
+  @image_name : String
 
   def initialize
-    @image_name = "gcr.io/docker-rails-258302/rails-sqlite"
+    @image_names = ["gcr.io/docker-rails-258302/rails-sqlite"]
+    @image_name = @image_names[0]
     @dockerfile_path = "./Dockerfile"
     @cache_stage_target = ""
   end

spec/cached_docker/template_command_spec.cr

@@ -2,9 +2,11 @@ require "../spec_helper"
 
 class Service
   include CachedDocker::TemplateCommand
+  @image_name : String
 
   def initialize
-    @image_name = "gcr.io/docker-rails-258302/rails-sqlite"
+    @image_names = ["gcr.io/docker-rails-258302/rails-sqlite"]
+    @image_name = @image_names[0]
     @dockerfile_path = "./spec/fixtures/Dockerfile.dev"
     @cache_stage_target = ""
     @image_tag = "v1"

src/cached_docker.cr

@@ -74,7 +74,7 @@ cli = Commander::Command.new do |cmd|
       puts cmd.help
     else
       app = CachedDocker::App.new(
-        image_name: options.string["image_name"],
+        image_names: options.string["image_name"].split(",").map &.strip,
         image_tag: options.string["image_tag"],
         push: options.bool["push"],
         dockerfile_path: options.string["dockerfile_path"],

src/cached_docker/app.cr

@@ -6,13 +6,15 @@ class CachedDocker::App
   include TemplateCommand
   include CachedStages
   @cache_stages : Array(Hash(String, String))
+  @image_name : String
   @push = true
   getter :image_tag, :dockerfile_path, :build_params
 
   def initialize(*,
-                 @image_name = "", @image_tag = "",
+                 @image_names = [""], @image_tag = "",
                  @push = true, @build_params = "",
                  @cache_stage_target = "", @dockerfile_path = "./Dockerfile")
+    @image_name = @image_names[0]
     if @dockerfile_path != "./Dockerfile"
       @build_params = "#{@build_params} -f #{@dockerfile_path}"
     end

src/cached_docker/template_command.cr

@@ -6,10 +6,7 @@ module CachedDocker::TemplateCommand
       "docker pull #{@image_name}",
       pull_cache_steps,
       build_cache_steps,
-      "docker build #{@build_params} #{cache_froms} \
-      -t #{@image_name} \
-      -t #{@image_name}:#{@image_tag} \
-      .",
+      "docker build #{@build_params} #{cache_froms} #{image_tags} .",
       @push ? push_commands : [] of String,
     ].flatten
   end
@@ -22,6 +19,12 @@ module CachedDocker::TemplateCommand
     ]
   end
 
+  def image_tags
+    @image_names.map do |image_name|
+      "-t #{image_name} -t #{image_name}:#{@image_tag}"
+    end.join(" ")
+  end
+
   def cache_froms
     stages = @cache_stages.map { |stage| "--cache-from=#{stage["name"]}" }.join(" ")
     "#{stages} --cache-from=#{@image_name}"