docklean 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e08fdae44e24ee61411f6415b09d2b4c08b78fc5
-  data.tar.gz: 58057df00b5af5b57e762906c934d27238126fc3
+  metadata.gz: 349b9e4041f0ddbed4accca5c002570e37fe4219
+  data.tar.gz: b0d4225514974336fe241e9fa2e669ba3e01be2e
 SHA512:
-  metadata.gz: 106f878dbfeeb6f962b2c7e7eb25a8c706a7192984115ed7cf3846423b3cc526c42cc6bfdd896e272b2b4b5ff28fec5c5187d9d28773526467ce7e23a8209a65
-  data.tar.gz: 15343acbc4ca3aae7e8ffadc3cf9cbe063fb2182b4c1c8557289e67f9e2af9d84e5b710e2ac3d688008abb9cd1accbcd6fc2687c89b2b9bedd381b383604fd8f
+  metadata.gz: fb0c570dad3d748eff59399e7020de956fefda9fce1d096865f2fdc122294bd33cbe9463a0e86488639c22c5ad151e0542bde4463368b3c51c90098b63c17436
+  data.tar.gz: ece41b9225f29af640f9c5fec74c038ab7870e7ed6aaa11558135340bc0c4c052fb359cc2e985b2b0cf88b05a1788e1a049c43adb9cc18e207b97c783bb2aaae

data/bin/config.yaml

@@ -1,3 +1,4 @@
 log_level: 'debug'
-docker_bin: '/usr/sbin/docker'
-max_age: 300
+docker_bin: '/usr/bin/docker'
+max_age: 86400 # 1 day
+keep_filter: 'DATA_*' # do not delete containers matching regex

data/bin/docklean.rb

@@ -1,5 +1,21 @@
-#!/usr/bin/ruby
-require 'date'
+#!/usr/bin/env ruby
+#
+#   Author: Tom Llewellyn-Smith <tom@onixconsulting.co.uk>
+#   Copyright: © Onix Consulting Limited 2012-2015. All rights reserved.
+#
+#   This program is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation, either version 3 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
 require 'docklean'
 require 'optparse'
 
@@ -15,8 +31,5 @@ config = options[:config] ||= 'bin/config.yaml'
 
 docklean = Docklean.new(config)
 
-docklean.get_containers()
-docklean.cleanup_containers()
-docklean.cleanup_images()
-
-puts docklean.dump()
+# cleans up all containers older than max_age and removes unused images
+docklean.scrub()

data/lib/docklean.rb

@@ -16,6 +16,7 @@
 #   You should have received a copy of the GNU General Public License
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
+require 'date'
 require 'docklean/base'
 require 'docklean/conf'
 require 'docklean/containers'

data/lib/docklean/base.rb

@@ -23,5 +23,11 @@ class Docklean
                 puts msg.chomp
             end
         end
+
+        def scrub
+            # cleans up containers/images
+            self.cleanup_containers()
+            self.cleanup_images()
+        end
     end
 end

data/lib/docklean/containers.rb

@@ -18,13 +18,13 @@
 #
 class Docklean
     module Containers
-        ## containers = {cont_id: {image_id => '', status => ''}}
         def get_containers()
             @containers = Hash.new()
             %x{#{@docker_bin} ps --no-trunc=true -q -a}.split(/\n/).each do |container|
                 container.chomp()
-                image_id,is_running,start_at,end_at = %x{#{@docker_bin} inspect --format "{{.Image}};{{.State.Running}};{{.State.StartedAt}};{{.State.FinishedAt}}" #{container}}.split(/;/)
+                name,image_id,is_running,start_at,end_at = %x{#{@docker_bin} inspect --format "{{.Name}};{{.Image}};{{.State.Running}};{{.State.StartedAt}};{{.State.FinishedAt}}" #{container}}.split(/;/)
                 @containers[container.to_sym] = {
+                    :name => name.gsub(/^\//,''),
                     :image_id => image_id.chomp(),
                     :is_running => is_running.chomp(),
                     :start_at => DateTime.parse(start_at.chomp().to_s).strftime('%s'),
@@ -43,8 +43,14 @@ class Docklean
                     when 'false'
                         # check it's older than MAX_AGE
                         if meta[:age] >= @max_age then
-                            %x{#{@docker_bin} rm #{container.to_s.chomp}}
-                            puts "info: deleting #{container.to_s.chomp} (container)"
+                            # only remove container if it doesn't match keep_filter
+                            unless meta[:name].match(%r{#{self.get_conf('keep_filter')}}) then
+                                %x{#{@docker_bin} rm #{container.to_s.chomp}}
+                                puts "info: deleting #{container.to_s.chomp} (container)"
+                            else
+                                # do not delete this image_id
+                                @images_to_keep.push(meta[:image_id])
+                            end
                         else
                             # do not delete this image_id
                             @images_to_keep.push(meta[:image_id])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docklean
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Tom Llewellyn-Smith