docker-rails 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61e25183a59f695d855dcfdc3d1b5caa4b6418d5
-  data.tar.gz: 9e3059dd5e309a69d48e45d8ea86858e8052ed85
+  metadata.gz: c15e19eedac4b56ec333ef623365115d04359dbb
+  data.tar.gz: 8a9ee44313c4ef3dc653d445563920881d30c6e8
 SHA512:
-  metadata.gz: 069b90234e74e45219f8160a316adfd112ce700cf42ccc745186b8d786f1f2334d810544d14b74c4b539762b19ea91f347763100a994602c30f1144268191bc1
-  data.tar.gz: fb2274af2b37723c53f79fb259810700fd5c66897eab81f4e5d762a0464ff19fba03da26a0f3825f1bc4e3a8b457bc8aee6569aa515aec8fd397fc20b9cbb41f
+  metadata.gz: f1eb936a2fdfdbbd12d54f788f08a789b765fc66f03be04113e542527688ca00f54c063939d2b68abb0faadd605e820ea56a9115246286d171bbdeeafee39205
+  data.tar.gz: 930ee9bac8c4cbc077573ac6179519475524bcabfd5696af8cb17d99c884f2775d815a40c936d87a2a92a03d63807acb81e0f6d794f82a541289b0d2195fe96e

data/README.md

@@ -176,8 +176,8 @@ COPY Gemfile                  Gemfile
 COPY Gemfile_shared.rb        Gemfile_shared.rb
 COPY spec/dummy/Gemfile       spec/dummy/Gemfile
 # This is only here to trigger re-bundle when lock changes, we actually only use the ImageGemfile.lock so that we are
-#   always doing a fresh bundle anytime the source lock changes.
-COPY Gemfile.lock             Gemfile.lock
+#   always doing a fresh bundle anytime the source lock changes.  Only keep the dummy lock in the repo, not the engine lock.
+COPY spec/dummy/Gemfile.lock  spec/dummy/Gemfile.lock
 
 # Bundle acme and the dummy app
 RUN \

data/lib/docker/rails/app.rb

@@ -164,6 +164,14 @@ module Docker
         exec_compose 'up', false, options #unless skip? :up
       end
 
+      def down(options = '')
+        # `compose down` doesn't support force removing images, so we use `rm --force`
+        exec_compose 'rm', false, '--force -v'
+
+        # Stop and remove all the linked services and network
+        exec_compose 'down', false, options
+      end
+
       def compose_build
         # Run the compose configuration
         exec_compose 'build'
@@ -180,42 +188,42 @@ module Docker
         exec 'docker ps -a'
       end
 
-      def stop_all
-        puts "\n\n\n\nStopping containers..."
-        puts '-----------------------------'
-        containers = Docker::Container.all(all: true)
-        containers.each do |container|
-          if is_project_container?(container)
-            stop(container)
-
-            service_name = container.compose.service
-            if @config['exit_code'].eql?(service_name)
-              if container.up?
-                puts "Unable to determine exit code, the #{service_name} is still up, current status: #{container.status}"
-                @exit_code = -999
-              else
-                @exit_code = container.exit_code
-              end
-            end
-          end
-        end
-        puts 'Done.'
-      end
-
-      def rm_volumes
-        puts "\n\nRemoving container volumes..."
-        puts '-----------------------------'
-
-        # http://docs.docker.com/v1.7/reference/api/docker_remote_api_v1.19/#remove-a-container
-        containers = Docker::Container.all(all: true)
-        containers.each do |container|
-          if is_project_container?(container)
-            puts container.name
-            rm_v(container)
-          end
-        end
-        puts 'Done.'
-      end
+      # def stop_all
+      #   puts "\n\n\n\nStopping containers..."
+      #   puts '-----------------------------'
+      #   containers = Docker::Container.all(all: true)
+      #   containers.each do |container|
+      #     if is_project_container?(container)
+      #       stop(container)
+      #
+      #       service_name = container.compose.service
+      #       if @config['exit_code'].eql?(service_name)
+      #         if container.up?
+      #           puts "Unable to determine exit code, the #{service_name} is still up, current status: #{container.status}"
+      #           @exit_code = -999
+      #         else
+      #           @exit_code = container.exit_code
+      #         end
+      #       end
+      #     end
+      #   end
+      #   puts 'Done.'
+      # end
+
+      # def rm_volumes
+      #   puts "\n\nRemoving container volumes..."
+      #   puts '-----------------------------'
+      #
+      #   # http://docs.docker.com/v1.7/reference/api/docker_remote_api_v1.19/#remove-a-container
+      #   containers = Docker::Container.all(all: true)
+      #   containers.each do |container|
+      #     if is_project_container?(container)
+      #       puts container.name
+      #       rm_v(container)
+      #     end
+      #   end
+      #   puts 'Done.'
+      # end
 
       def rm_dangling
         puts "\n\nCleaning up dangling images..."

data/lib/docker/rails/cli/main.rb

@@ -41,13 +41,12 @@ module Docker
           app.extract_all
         end
 
-        desc 'cleanup <target>', 'Runs container cleanup functions stop, rm_volumes, rm_compose, rm_dangling, ps_all e.g. docker-rails cleanup --build=222 development'
+        desc 'cleanup <target>', 'Runs container cleanup functions extract, down, rm_compose, rm_dangling, ps_all e.g. docker-rails cleanup --build=222 development'
         option :extract, aliases: ['-e'], type: :boolean, default: true, desc: 'Extract any directories defined in configuration.'
 
         def cleanup(target)
-          invoke :stop
           invoke :extract if options[:extract]
-          invoke :rm_volumes
+          invoke :down
           invoke :rm_compose
           # invoke :rm_dangling # causes a brand new dockerfile build - don't do that. See https://github.com/alienfast/docker-rails/issues/26
           invoke :ps_all
@@ -100,18 +99,11 @@ module Docker
           app.before_command
         end
 
-        desc 'stop <target>', 'Stop all running containers for the given build/target e.g. docker-rails stop --build=222 development'
+        desc 'down <target>', 'Stop and cleanup all running containers for the given build/target e.g. docker-rails down --build=222 development'
 
-        def stop(target)
+        def down(target)
           invoke :compose
-          App.configured(target, options).stop_all
-        end
-
-        desc 'rm_volumes <target>', 'Stop all running containers and remove corresponding volumes for the given build/target e.g. docker-rails rm_volumes --build=222 development'
-
-        def rm_volumes(target)
-          invoke :stop
-          App.configured(target, options).rm_volumes
+          App.configured(target, options).down
         end
 
         desc 'rm_compose', 'Remove generated docker_compose file e.g. docker-rails rm_compose --build=222 development', hide: true

data/lib/docker/rails/version.rb

@@ -1,5 +1,5 @@
 module Docker
   module Rails
-    VERSION = '1.0.0'
+    VERSION = '1.1.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Kevin Ross
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-19 00:00:00.000000000 Z
+date: 2016-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler