docker-rails 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 676f2ab08aa5bab4eaa12cd439e73e5b24d05203
-  data.tar.gz: 725d25ce15b195dd2cce0d487198754ab507da5c
+  metadata.gz: 4bea08b80bfee7c817a0d284f58c74cc0e61638e
+  data.tar.gz: f653e9e076dc95d265cb2c0ad6aefe2735f0bc2c
 SHA512:
-  metadata.gz: dfd7b13048590fd015a9a1bfc2dd574a449007ebc2159f2af15628b04172a29684d418bf728454c40385eb35da1db491c7877328793bbe9209437ff5279a4462
-  data.tar.gz: 22fbca62f1a72eca0cef0fe1aaa64e0de97e46de1b49ad518f0600c2a38815288f95fd0780dbbb19557de7249788c4dd595c4077d369aeda41d2b8a70d55436d
+  metadata.gz: 41d7d30694f656d154ab484fea66222188bd564516eb40fddbefc07dde15eed7971a600bdc6e0af5ce549b943cd15860ddef44c810b3c897e11ac7f9da54c595
+  data.tar.gz: 980a7d3cd628c9100ef9fd6b0a65fd834a0a4b1c221a7c40004a42ad233ebcd01870333e54d8e922baa96b1fe8864b8e3cad85733b19e6b7ad03a411d2838d54

data/lib/docker/rails/app.rb

@@ -247,8 +247,10 @@ module Docker
         puts '-----------------------------'
 
         list_images_cmd = 'docker images --filter dangling=true -q'
-        output = exec list_images_cmd, true
-        exec "#{list_images_cmd} | xargs docker rmi" if !output.nil? && output.length > 0
+        output = exec( list_images_cmd, true)
+
+        # if there are any dangling, let's clean them up.
+        exec("#{list_images_cmd} | xargs docker rmi", false, true) if !output.nil? && output.length > 0
         puts 'Done.'
       end
 
@@ -284,7 +286,7 @@ module Docker
 
       protected
 
-      def exec(cmd, capture = false)
+      def exec(cmd, capture = false, ignore_errors = false)
         puts "Running `#{cmd}`" if verbose?
         if capture
           output = %x[#{cmd}]
@@ -292,13 +294,13 @@ module Docker
           system cmd
         end
 
-        raise "Failed to execute: `#{cmd}`" unless $?.success?
+        (raise "Failed to execute: `#{cmd}`" unless $?.success?) unless ignore_errors
         output
       end
 
       # convenience to execute docker-compose with file and project params
       def exec_compose(cmd, capture = false, options = '')
-        exec("docker-compose -f #{@compose_filename} -p #{@build} #{cmd} #{options}", capture)
+        exec("docker-compose -f #{@compose_filename} -p #{@project_name} #{cmd} #{options}", capture)
       end
 
       def get_container(service_name)

data/lib/docker/rails/version.rb

@@ -1,5 +1,5 @@
 module Docker
   module Rails
-    VERSION = '0.5.3'
+    VERSION = '0.5.4'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker-rails
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Kevin Ross