ufo 4.5.3 → 4.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 882615890a0eb95cf707cb6c001833e5b8631b8bacc75422712c0adc225f49af
-  data.tar.gz: c0cafd3bc2b4886ebf74eb1fd4a660d51571cdb332ca68504e17e05f39b8e94f
+  metadata.gz: 66df80258881426de197903fb8f5fb1e6105d688f2cde690b98884f060ea134b
+  data.tar.gz: c4032f3c68551d0ba3436953ee001b71fa5a629d62d8684b01a9d2b1f170d87a
 SHA512:
-  metadata.gz: 893d769390f42685a3046d44e8399f63548a971dd324462c0c7ddff7b000cd829ae7a48266ad51581747d3a0d52f0105d1cfb4e579390cac90c1e20f70ddec68
-  data.tar.gz: 53f5cb6aa31c5c08bb0c1ec24eb0994084b79f7f397ba5bb6d17db1b4aa3eb237c899cce34faf165838d373d0286dfcadf00b49e305cf2f621078e24533e3370
+  metadata.gz: def48872244ef871377f433b4bb56fdea3bcf0a1e9475a714439b2f566af64644d0eee8f2b81a4c0b54049467db24cd3ae1e37d99d01f85e2a4c64a5c8061d8d
+  data.tar.gz: 686dcad5e51f5b9d62308e44dc1c9ebec202c4607389564d2764a6b37ddb56cdff776e8fef8e87f421fdd532865f4ca1dced624e36158ed273027e7b63e0d7ec

data/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 This project *tries* to adhere to [Semantic Versioning](http://semver.org/), even before v1.0.
 
+## [4.5.4]
+- Merge pull request #85 `ufo docker compile` command. ability to compile Dockerfile from Dockerfile.erb w/o building
+- Merge pull request #86 slight improvement to `ufo docker compile`
+
 ## [4.5.3]
 - fix error exit code when unable to find task definition
 - fix upgrade for empty base setting

data/docs/_reference/ufo-docker-compile.md

@@ -0,0 +1,19 @@
+---
+title: ufo docker compile
+reference: true
+---
+
+## Usage
+
+    ufo docker compile
+
+## Description
+
+Compile Dockerfile.erb
+
+The `ufo docker compile` compiles the Dockerfile using the Dockerfile.erb in the current project folder.  Example:
+
+    ufo docker compile
+
+
+

data/docs/_reference/ufo-docker.md

@@ -23,6 +23,7 @@ docker subcommands
 * [ufo docker base]({% link _reference/ufo-docker-base.md %}) - Build docker image from `Dockerfile.base` and update current `Dockerfile`.
 * [ufo docker build]({% link _reference/ufo-docker-build.md %}) - Build docker image.
 * [ufo docker clean]({% link _reference/ufo-docker-clean.md %}) - Clean up old images. Keeps a specified amount.
+* [ufo docker compile]({% link _reference/ufo-docker-compile.md %}) - Compile Dockerfile.erb
 * [ufo docker name]({% link _reference/ufo-docker-name.md %}) - Display the full docker image with tag that was last generated.
 * [ufo docker push]({% link _reference/ufo-docker-push.md %}) - Push the docker image.
 

data/lib/template/.ufo/settings/network/default.yml.tt

@@ -9,8 +9,7 @@ elb_subnets: # defaults to same subnets as ecs_subnets when not set
   - <%= subnet %>
 <% end -%>
 
-# Optional additional existing security group ids to add on top of the ones created
-# by ufo.
+# Optional additional existing security group ids to add on top of the ones created by ufo.
 # elb_security_groups:
 #   - sg-aaa
 # ecs_security_groups:

data/lib/ufo/docker.rb

@@ -9,6 +9,13 @@ module Ufo
       push if options[:push]
     end
 
+    desc "compile", "Compile Dockerfile.erb"
+    long_desc Help.text("docker:compile")
+    def compile
+      builder = Docker::Builder.new(options)
+      builder.compile
+    end
+
     desc "push IMAGE", "Push the docker image."
     long_desc Help.text("docker:push")
     option :push, type: :boolean, default: false

data/lib/ufo/docker/builder.rb

@@ -82,7 +82,17 @@ class Ufo::Docker
     end
 
     def compile_dockerfile_erb
-      Compiler.new("#{Ufo.root}/#{@dockerfile}").compile
+      Compiler.new("#{Ufo.root}/#{@dockerfile}").compile # This path does not have .erb
+    end
+    private :compile_dockerfile_erb
+
+    def compile
+      erb_path = "#{Ufo.root}/#{@dockerfile}.erb"
+      if File.exist?(erb_path)
+        compile_dockerfile_erb
+      else
+        puts "File #{erb_path.color(:green)} does not exist. Cannot compile it if it doesnt exist"
+      end
     end
 
     def check_dockerfile_exists

data/lib/ufo/help/docker/compile.md

@@ -0,0 +1,3 @@
+The `ufo docker compile` compiles the Dockerfile using the Dockerfile.erb in the current project folder.  Example:
+
+    ufo docker compile

data/lib/ufo/version.rb

@@ -1,3 +1,3 @@
 module Ufo
-  VERSION = "4.5.3"
+  VERSION = "4.5.4"
 end

data/spec/fixtures/dockerfiles/Dockerfile.erb

@@ -0,0 +1 @@
+FROM ruby:2.5.0

data/spec/lib/cli_spec.rb

@@ -15,6 +15,12 @@ describe Ufo::CLI do
         out = execute("exe/ufo docker name #{@args}")
         expect(out).to match(%r{tongueroo/demo-ufo:ufo-.{7}})
       end
+
+      it "compiles Dockerfile from Dockerfile.erb" do
+        FileUtils.cp("spec/fixtures/dockerfiles/Dockerfile.erb", "#{Ufo.root}/Dockerfile.erb")
+        out = execute("exe/ufo docker compile #{@args}")
+        expect(out).to include("Compiled Dockerfile.erb to Dockerfile")
+      end
     end
 
     context "tasks" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ufo
 version: !ruby/object:Gem::Version
-  version: 4.5.3
+  version: 4.5.4
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-26 00:00:00.000000000 Z
+date: 2019-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-cloudformation
@@ -393,6 +393,7 @@ files:
 - docs/_reference/ufo-docker-base.md
 - docs/_reference/ufo-docker-build.md
 - docs/_reference/ufo-docker-clean.md
+- docs/_reference/ufo-docker-compile.md
 - docs/_reference/ufo-docker-help.md
 - docs/_reference/ufo-docker-name.md
 - docs/_reference/ufo-docker-push.md
@@ -520,6 +521,7 @@ files:
 - lib/ufo/help/docker/base.md
 - lib/ufo/help/docker/build.md
 - lib/ufo/help/docker/clean.md
+- lib/ufo/help/docker/compile.md
 - lib/ufo/help/docker/name.md
 - lib/ufo/help/docker/push.md
 - lib/ufo/help/help.md
@@ -579,6 +581,7 @@ files:
 - spec/fixtures/cfn/stack-events-in-progress.json
 - spec/fixtures/cfn/stack-events-update-rollback-complete.json
 - spec/fixtures/deployments.json
+- spec/fixtures/dockerfiles/Dockerfile.erb
 - spec/fixtures/dockerfiles/dockerhub/Dockerfile
 - spec/fixtures/dockerfiles/ecr/Dockerfile
 - spec/fixtures/home_existing/.aws/config
@@ -629,6 +632,7 @@ test_files:
 - spec/fixtures/cfn/stack-events-in-progress.json
 - spec/fixtures/cfn/stack-events-update-rollback-complete.json
 - spec/fixtures/deployments.json
+- spec/fixtures/dockerfiles/Dockerfile.erb
 - spec/fixtures/dockerfiles/dockerhub/Dockerfile
 - spec/fixtures/dockerfiles/ecr/Dockerfile
 - spec/fixtures/home_existing/.aws/config