brpm_content_framework 0.2.41 → 0.2.42

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjRlMWMyZWNkZDMwMTQwNjE5MDUwMTExOTgzNGM0ODA0ODE3OWUxYQ==
+    Yzk0ZDJjYzcyYzAzNDZlYTQ1YzFjY2JhODZjZWNkMjZiOWExOWE3MA==
   data.tar.gz: !binary |-
-    MTdhNTdmZGFmN2Q1OGY1NmZkM2RlNmJmYTQ3Yzg4Y2E0ODJkNWE4Yw==
+    MjdlNWZhYTI0YWI3MTZmOGRhMjE4ODI0ZGI4OGRiMTE3YWZhOTZhZQ==
 SHA512:
   metadata.gz: !binary |-
-    YmNhNmFiZjczMzRhNmUxNTRiNTU5M2FlYWQyOGE4YzIxYWRkNzA2N2QzMDUx
-    ZDU2NTZhMGYyNGIxMGNlNzM2NmMxNmI4YWU0MjA0Y2EyMzIwMjhhNGE3OGYw
-    ZTU4MGMxODQ1ZjZhYjhkNjE0YjUzY2VlZjdkZDRkODBmMzE2NDE=
+    NDIzOGU4NWI3ODMxZDRjMzVlMmI5MTIwOTFlZDAyMzhmZDJjZDhmN2ZjN2Rj
+    ZTRiYzk1MGVmYmQ1OTE3MDU1YTRiM2M4ZDFkYzFlZGI5NTg3NTllODI5MWNm
+    MTA0ZWUyOWI5NWRkZGU4NjQ1MTc2ODkzN2NiMjVhODgxOGI0ODI=
   data.tar.gz: !binary |-
-    NjljM2U0MjA0MWMzMmRjMTUwNDBlMzIxOWMzOTE3OTI4ODhkMDlmNjY4MTk3
-    MmI5OTQ0ZDhmZjc0NWFlNTYzYzY5MDA1Y2E4ZGM0MmVmNjFhOWQ1NjRmNDA0
-    MWY5MjljN2IxZmJiYzUwM2U5MzgxMTJlZjJhYjI2MzgyYjQxYWY=
+    ZmUwZjQxODNhMDFiNjBmMDRlZTQyMTMwNThjYjMxMzU3YmRmYTNjOGYwMmVj
+    NjA3MWI2NzUxMTFmYWFkYWU1NmExMmFkZjcxZjg4YzIxNDdiZThiODIxMmQ1
+    NmViMmQ3YTM1OTVkMTg3YTg4ZmFmYWU2NGVlZDZhMTU3ZjIxMWM=

data/bin/build_docker_image

@@ -1,22 +1,34 @@
 #!/usr/bin/env ruby
 require "brpm_auto"
 
+usage =  "Usage: \n  build_docker_image <path to module>\n  build_docker_image <module name> [<module version>]"
+
 if ARGV.size < 1
   puts "Missing arguments."
-  puts "Usage: \n  build_docker_image <path to module>"
+  puts usage
   exit
 end
 
 begin
   BrpmAuto.setup({ "log_file" => "/tmp/brpm_install.log", "also_log_to_console" => "true" })
 
-  module_path = File.expand_path(ARGV[0])
+  if File.directory?(File.expand_path(ARGV[0]))
+    module_path = File.expand_path(ARGV[0])
 
-  module_name = File.basename(module_path)
-  module_config = YAML.load_file("#{module_path}/config.yml")
-  module_version = module_config["version"]
+    module_name = File.basename(module_path)
+    module_config = YAML.load_file("#{module_path}/config.yml")
+    module_version = module_config["version"]
+  else
+    module_name = ARGV[0]
+    module_version = if ARGV.size >= 2
+      ARGV[1]
+    else
+      module_spec = Gem::Specification.find_by_name(module_name)
+      module_spec.version
+    end
+  end
 
-  BrpmAuto.log "Module #{module_name} #{module_version}"
+  BrpmAuto.log "Building a docker image for module #{module_name} #{module_version}"
 
   if module_name == "brpm_content_framework"
     dockerfile_path = File.expand_path("#{File.dirname(__FILE__)}/../docker/framework/Dockerfile")
@@ -27,9 +39,7 @@ begin
   dockerfile_content = File.read(dockerfile_path)
   dockerfile_original_content = File.read(dockerfile_path)
 
-  unless module_name == "brpm_content_framework"
-    dockerfile_content.sub!(/(?<=ENV MODULE )(.*)/, module_name)
-  end
+  dockerfile_content.sub!(/(?<=ENV MODULE )(.*)/, module_name)
   dockerfile_content.sub!(/(?<=ENV VERSION )(.*)/, module_version)
 
   File.open(dockerfile_path, "w") do |file|

data/bin/publish_docker_image

@@ -16,7 +16,7 @@ begin
   module_config = YAML.load_file("#{module_path}/config.yml")
   module_version = module_config["version"]
 
-  BrpmAuto.log "Module #{module_name} #{module_version}"
+  BrpmAuto.log "Publishing a docker image for module #{module_name} #{module_version}"
 
   if module_name == "brpm_content_framework"
     dockerfile_path = File.expand_path("#{File.dirname(__FILE__)}/../docker/framework/Dockerfile")

data/config.yml

@@ -1,4 +1,4 @@
-version: 0.2.41
+version: 0.2.42
 author: Niek Bartholomeus
 email: niek.bartholomeus@gmail.com
 homepage: https://github.com/BMC-RLM/brpm_content_framework

data/docker/framework/Dockerfile

@@ -2,14 +2,13 @@ FROM atlashealth/ruby:1.9.3
 MAINTAINER Niek Bartholomeus <niek.bartholomeus@gmail.com>
 
 ENV GEM_HOME /usr/lib/ruby/gems/1.9.1
+ENV MODULE brpm_content_framework
 ENV VERSION 1.0.0
 
-RUN gem install brpm_content_framework -v $VERSION && \
-    cd $GEM_HOME/gems/brpm_content_framework-$VERSION && \
-    bundle install && \
-    rm -rf $GEM_HOME/cache
+COPY install_gem.sh /
+RUN /install_gem.sh
 
-ADD . /
+COPY docker_execute_automation /
 
 VOLUME [ "/workdir" ]
 VOLUME [ "/automation_results" ]

data/docker/framework/install_gem.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+gem install $MODULE -v $VERSION --ignore-dependencies
+cd $GEM_HOME/gems/$MODULE-$VERSION
+bundle install
+rm -rf $GEM_HOME/cache

data/docker/modules/Dockerfile

@@ -4,6 +4,8 @@ MAINTAINER Niek Bartholomeus <niek.bartholomeus@gmail.com>
 ENV MODULE module
 ENV VERSION 1.0.0
 
+
+
 RUN gem install $MODULE -v $VERSION && \
     cd $GEM_HOME/gems/$MODULE-$VERSION && \
     bundle install && \

data/lib/module_installer.rb

@@ -177,13 +177,18 @@ class ModuleInstaller
       stdout, stderr, _, status = BrpmAuto.execute_command("docker pull bmcrlm/#{spec.name}:#{spec.version}") do |stdout_err|
         BrpmAuto.log "    #{stdout_err.chomp}"
       end
-      raise "The process failed with status #{status.exitstatus}.\n#{stderr}" unless status.success?
 
-      unless stdout =~ /Image is up to date for/ or stdout =~ /Downloaded newer image for/
-        if BrpmAuto.global_params["execute_automation_scripts_in_docker"] == "always"
-          raise "Docker image bmcrlm/#{spec.name}:#{spec.version} doesn't exist."
-        elsif BrpmAuto.global_params["execute_automation_scripts_in_docker"] == "if_docker_image_exists"
-          BrpmAuto.log "Docker image bmcrlm/#{spec.name}:#{spec.version} doesn't exist."
+      if stdout =~ /Image is up to date for/ or stdout =~ /Downloaded newer image for/
+        #all went fine
+      else
+        if stderr =~ /not found/
+          if BrpmAuto.global_params["execute_automation_scripts_in_docker"] == "always"
+            raise stderr.chomp
+          elsif BrpmAuto.global_params["execute_automation_scripts_in_docker"] == "if_docker_image_exists"
+            BrpmAuto.log stderr.chomp
+          end
+        else
+          raise "The process failed with status #{status.exitstatus}.\n#{stderr}" unless status.success?
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brpm_content_framework
 version: !ruby/object:Gem::Version
-  version: 0.2.41
+  version: 0.2.42
 platform: ruby
 authors:
 - Niek Bartholomeus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-03 00:00:00.000000000 Z
+date: 2015-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -185,6 +185,7 @@ files:
 - config.yml
 - docker/framework/Dockerfile
 - docker/framework/docker_execute_automation
+- docker/framework/install_gem.sh
 - docker/modules/Dockerfile
 - infrastructure/.bashrc
 - infrastructure/.brpm