odania_ops 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f42edd75a33b30dc4e03ae007b144552d61a6ec0
-  data.tar.gz: b65df0c2568b7f53e79e3c8b0fecf524e82507f2
+  metadata.gz: f2ef4cec293379972baf2430c3d494740583cda2
+  data.tar.gz: 890d7dcdec897ca889ab16d38b07dfad0d5db7f5
 SHA512:
-  metadata.gz: 20f456049862905d6431e812e94b8cba282618a757a3c0b1073cfcfb6efb46dd8372125b3bb0b5afea3df7ed2e92f814ddddbeddeeda13cdd10dc11cb9f32259
-  data.tar.gz: 0e3b14e76ef8874a15313d4369369c57b4673a1c947b85ca0c7987d9e747c9270f051c456d2e2d20cf9e85b978820b135e3862cbf52447957755fc16089ee51c
+  metadata.gz: 8f7dc799bae8d45dde31c96520e29b6a7efcc9c320f64e325ebb29ada9874a6a6e2e7876a707b7e9c456a4d21975ddc740a67b43f5868a52f62bd9d96ad21199
+  data.tar.gz: cb5972ec0150e0958f67650ac6d35093816de9ce420e3dcb21a0b43c7872d7fdef3e95cde41eae082979cfc575a6841153e4fa5c5c878a571317b301c69105b4

data/.gitignore

@@ -1 +1,2 @@
 .idea
+pkg

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    odania_ops (0.0.1)
+    odania_ops (0.0.2)
+      activesupport
       deep_merge
       docker-api
       httparty
@@ -10,6 +11,12 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    activesupport (4.2.4)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
     deep_merge (1.0.1)
     docker-api (1.24.1)
       excon (>= 0.38.0)
@@ -18,9 +25,14 @@ GEM
     httparty (0.13.7)
       json (~> 1.8)
       multi_xml (>= 0.5.2)
+    i18n (0.7.0)
     json (1.8.3)
+    minitest (5.8.3)
     multi_xml (0.5.5)
     thor (0.19.1)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby

data/README.md

@@ -49,3 +49,14 @@ This will build and push to v10 and latest.
 #### Version numbers
 
 Version numbers are expected to be in tags like v1 (vNUMBER in general).
+
+### base_image_check
+
+This command checks all Dockerfiles under <folder> for new base images.
+
+The folder name has to be the name of the image. The image is looked up in the registry from the config.
+
+Example:
+```
+bundle exec ops docker base_image_check ~/workspace/docker
+```

data/lib/odania_ops/cli/docker.rb

@@ -9,7 +9,7 @@ module OdaniaOps
 				build_tag = "v#{build_number}"
 				$logger.info "Building version #{build_tag}"
 
-				base_image = get_base_image(folder)
+				base_image = get_base_image File.expand_path('Dockerfile', folder)
 				$logger.info "Pulling base image #{base_image}"
 				OdaniaOps::Helper::Shell.execute("docker pull #{base_image}")
 
@@ -24,17 +24,33 @@ module OdaniaOps
 				OdaniaOps::Helper::Docker.push image_name
 			end
 
+			desc 'base_image_check <folder>', 'Searches for all Dockerfiles under <folder> and looks for the base image'
+			def base_image_check(folder)
+				failed_images = []
+				Dir.glob("#{folder}/**/Dockerfile").each do |file|
+					result = check_latest_base_image file
+					failed_images << result unless result
+				end
+
+				unless failed_images.empty?
+					puts
+					puts
+					puts 'The following images have newer base images:'
+					puts failed_images.inspect
+					exit 1
+				end
+			end
+
 			private
 
 			def get_highest_build_number(image_name)
 				build_numbers = OdaniaOps::Helper::Docker.image_tags(image_name).map { |tag| tag.gsub('v', '').to_i }.sort
-				puts build_numbers.inspect
+				$logger.debug "Build numbers: #{build_numbers.inspect}"
 				return 0 if build_numbers.empty?
 				build_numbers.pop
 			end
 
-			def get_base_image(folder)
-				docker_file = File.expand_path 'Dockerfile', folder
+			def get_base_image(docker_file)
 				contents = File.read(docker_file)
 				contents.split("\n").each do |line|
 					return line.gsub('FROM', '').strip if line.start_with? 'FROM'
@@ -42,6 +58,41 @@ module OdaniaOps
 
 				raise "No base image detected in #{docker_file}"
 			end
+
+			def check_latest_base_image(file)
+				path = File.dirname file
+				image_name = "#{OdaniaOps::Helper::Docker.registry_name}/#{path.split(File::SEPARATOR).last}"
+				base_image = get_base_image file
+				$logger.info "Found image \"#{image_name}\" with base image \"#{base_image}\""
+
+				$logger.debug "Pulling base image \"#{base_image}\""
+				OdaniaOps::Helper::Shell.execute("docker pull #{base_image}")
+
+				$logger.debug "Pulling image \"#{image_name}\""
+				OdaniaOps::Helper::Shell.execute("docker pull #{image_name}")
+
+				# Retrieve parent of image
+				parent_docker_image = ::Docker::Image.get image_name
+				docker_image = ::Docker::Image.get base_image
+				maintainer_found = false
+				last_entry = nil
+				parent_docker_image.history.each do |entry|
+					if maintainer_found
+						$logger.debug "Detected line before MAINTAINER: #{entry}"
+						last_entry = entry
+						break
+					end
+					maintainer_found = true if entry['CreatedBy'].include? 'MAINTAINER'
+				end
+
+				if docker_image.history.first.eql? last_entry
+					$logger.info "Image #{image_name} already has latest base image"
+					return true
+				end
+
+				$logger.error "Image #{image_name} has not the newest base image"
+				image_name
+			end
 		end
 	end
 end

data/lib/odania_ops/helper/docker.rb

@@ -21,21 +21,20 @@ module OdaniaOps
 				def login
 					$logger.info "Loggin in to private registry #{registry_name}"
 					data = $config['docker']
-					puts data.inspect
 					OdaniaOps::Helper::Shell.execute("docker login --username=#{data['user']} --password=\"#{data['password']}\" --email=#{data['email']} #{registry_url}")
 				end
 
+				def registry_name
+					uri = URI.parse $config['docker']['url']
+					uri.host
+				end
+
 				private
 
 				def auth
 					{:username => $config['docker']['user'], :password => $config['docker']['password']}
 				end
 
-				def registry_name
-					uri = URI.parse $config['docker']['url']
-					uri.host
-				end
-
 				def registry_url
 					uri = URI.parse $config['docker']['url']
 					uri.path = '/v2'
@@ -45,9 +44,6 @@ module OdaniaOps
 				def get(query_url)
 					$logger.debug "Query registry: #{registry_url}#{query_url}"
 					response = HTTParty.get("#{registry_url}#{query_url}", :basic_auth => auth)
-					puts response.inspect
-					puts response.code
-					puts response.parsed_response.inspect
 					return response.code, response.parsed_response
 				end
 			end

data/lib/odania_ops/version.rb

@@ -1,3 +1,3 @@
 module OdaniaOps
-	VERSION = '0.0.1'
-end
+	VERSION = '0.0.2'
+end

data/lib/odania_ops.rb

@@ -4,6 +4,8 @@ require 'httparty'
 require 'logger'
 require 'yaml'
 require 'deep_merge/rails_compat'
+require 'active_support/all'
+require 'docker-api'
 
 require_relative 'odania_ops/cli/config'
 require_relative 'odania_ops/cli/docker'
@@ -16,11 +18,19 @@ $logger = Logger.new(STDOUT)
 $logger.level = Logger::INFO
 
 # Load Config
-OdaniaOps::Helper::Config.load_config(__FILE__)
+OdaniaOps::Helper::Config.load_config(File.dirname(__FILE__))
 
 module OdaniaOps
 	module Cli
 		class Application < Thor
+			class_option :log_level, :default => 'INFO', :aliases => '-l', enum: %w(INFO DEBUG ERROR WARN UNKNOWN FATAL), desc: 'Set Log Level'
+
+			def initialize(*args)
+				super
+
+				$logger.level = "Logger::#{options['log_level']}".constantize
+			end
+
 			desc 'docker', 'Docker helper'
 			subcommand 'docker', Docker
 

data/odania_ops.gemspec

@@ -16,8 +16,9 @@ Gem::Specification.new do |gem|
 	gem.version       = OdaniaOps::VERSION
 	gem.license       = 'MIT'
 
-	gem.add_dependency 'thor'
+	gem.add_dependency 'activesupport'
+	gem.add_dependency 'deep_merge'
 	gem.add_dependency 'docker-api'
 	gem.add_dependency 'httparty'
-	gem.add_dependency 'deep_merge'
+	gem.add_dependency 'thor'
 end

metadata

@@ -1,17 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: odania_ops
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Mike Petersen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-03 00:00:00.000000000 Z
+date: 2016-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: deep_merge
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: deep_merge
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="