conjur-debify 0.4.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24d8fe10e0486db7bb2507eb4437011c7b604553
-  data.tar.gz: 74d13c5b2998e96664c704b1f3e25e4d913c776d
+  metadata.gz: 237173296d36243ddc8ad529b34b370aa2be9d0a
+  data.tar.gz: e0282d3f9c0ae54e2ce1ecd2a96e82cd1f3770a8
 SHA512:
-  metadata.gz: 8cc53a5458f5dc85665a6a58b5fe15b0b373834645504fe2e9bc1a80caafddbbd8987f0939e45e111e14565bd00d9839307e7716d9f53c5cb3db30a4ce0d363b
-  data.tar.gz: 4d651e1ba3026f937ce23474e4710df624415416860cc814d4e272447fd3e33b063abf8cc998995e4c1cf22623d7cca3fbe6c5eeb898e991e08c563836dc0fcb
+  metadata.gz: 8b3aa38f2accc5fcf7e57a98d5a4c13461f420f7b66c2e546e9d84091ecf410d75d990d0507c652283417f811e3f970e902006359be97557e68c12da1a2a48bc
+  data.tar.gz: 2284cabc731e5e73c4fe50014e51e5d96663ab8a3f9cd896687efb385bd77d20ca77f600bd29f7eb320f821efd320a7be4ec9db602b4c4e80ed7ee654d8ee8fe

data/CHANGELOG.md

@@ -0,0 +1,5 @@
+# 0.5.0
+
+* `package` : Add `--dockerfile` option
+* `package` : Ensure that `Gemfile.lock` is in the container
+* `test` : Propagate `SSH_AUTH_SOCK` to the container

data/lib/conjur/debify.rb

@@ -10,7 +10,7 @@ Docker.options[:read_timeout] = 300
 # This is used to turn on DEBUG notices for the test case operation. For instance,
 # messages from "evoke configure"
 module DebugMixin
-  DEBUG = ENV['DEBUG']
+  DEBUG = ENV['DEBUG'].nil? ? true : ENV['DEBUG'].downcase == 'true'
 
   def debug *a
     DebugMixin.debug *a
@@ -86,6 +86,9 @@ command "package" do |c|
   
   c.desc "Specify the deb version; by default, it's computed from the Git tag"
   c.flag [ :v, :version ]
+
+  c.desc "Specify a custom Dockerfile.fpm"
+  c.flag [ :dockerfile]
   
   c.action do |global_options,cmd_options,args|
     raise "project-name is required" unless project_name = args.shift
@@ -105,16 +108,18 @@ command "package" do |c|
     dir = File.expand_path(dir)
     Dir.chdir dir do
       version = cmd_options[:version] || detect_version
+      dockerfile_path = cmd_options[:dockerfile] || File.expand_path("debify/Dockerfile.fpm", pwd)
+      dockerfile = File.read(dockerfile_path)
 
       package_name = "conjur-#{project_name}_#{version}_amd64.deb"
       
       output = StringIO.new
       Gem::Package::TarWriter.new(output) do |tar|
-        `git ls-files -z`.split("\x0").each do |fname|
+        (`git ls-files -z`.split("\x0") + ['Gemfile.lock']).uniq.each do |fname|
           stat = File.stat(fname)
           tar.add_file(fname, stat.mode) { |tar_file| tar_file.write(File.read(fname)) }
         end
-        tar.add_file('Dockerfile', 0640) { |tar_file| tar_file.write File.read(File.expand_path("debify/Dockerfile.fpm", pwd)).gsub("@@image@@", fpm_image.id) }
+        tar.add_file('Dockerfile', 0640) { |tar_file| tar_file.write dockerfile.gsub("@@image@@", fpm_image.id) }
       end
       output.rewind
         
@@ -167,9 +172,6 @@ Then the evoke "test-install" command is used to install the test code in the
 /src/<project-name>. Basically, the development bundle is installed and the database
 configuration (if any) is setup.
 
-Next, an optional "configure-script" from the project source tree is run, with the 
-container id as the program argument. This command waits for Conjur to be healthy again.
-
 Finally, a test script from the project source tree is run, again with the container
 id as the program argument. 
 
@@ -195,9 +197,6 @@ command "test" do |c|
   c.default_value true
   c.switch [ :pull ]
     
-  c.desc "Shell script to configure the appliance before testing"
-  c.flag [ :c, "configure-script" ]
-    
   c.action do |global_options,cmd_options,args|
     raise "project-name is required" unless project_name = args.shift
     raise "test-script is required" unless test_script = args.shift
@@ -212,27 +211,59 @@ command "test" do |c|
     Dir.chdir dir do
       image_tag = cmd_options["image-tag"] or raise "image-tag is required"
       appliance_image_id = [ cmd_options[:image], image_tag ].join(":")
-      configure_script = cmd_options["configure-script"]
         
-      raise "#{configure_script} does not exist or is not a file" unless configure_script.nil? || File.file?(configure_script)
       raise "#{test_script} does not exist or is not a file" unless File.file?(test_script)
-        
-      appliance_image = if cmd_options[:pull]
-        Docker::Image.create 'fromImage' => appliance_image_id, &DebugMixin::DOCKER
-      else
-        Docker::Image.get(appliance_image_id)
+      
+      Docker::Image.create 'fromImage' => appliance_image_id, &DebugMixin::DOCKER if cmd_options[:pull]
+      
+      def build_test_image(appliance_image_id, project_name)
+        deb = "conjur-#{project_name}_latest_amd64.deb"
+        dockerfile = <<-DOCKERFILE
+FROM #{appliance_image_id}
+
+COPY #{deb} /tmp/
+
+RUN rm -rf /opt/conjur/#{project_name}
+RUN rm -f /opt/conjur/etc/#{project_name}.conf
+RUN rm -f /usr/local/bin/conjur-#{project_name}
+
+RUN dpkg --force all --purge conjur-#{project_name} || true
+RUN dpkg --install /tmp/#{deb}
+
+RUN touch /etc/service/conjur/down
+        DOCKERFILE
+        Dir.mktmpdir do |tmpdir|
+          tmpfile = Tempfile.new('Dockerfile', tmpdir)
+          File.write(tmpfile, dockerfile)
+          dockerfile_name = File.basename(tmpfile.path)
+          tar_cmd = "tar -cvzh -C #{tmpdir} #{dockerfile_name} -C #{Dir.pwd} #{deb}"
+          tar = open("| #{tar_cmd}")
+          begin
+            Docker::Image.build_from_tar(tar, :dockerfile => dockerfile_name, &DebugMixin::DOCKER)
+          ensure
+            tar.close
+          end
+        end
       end
+
+      appliance_image = build_test_image(appliance_image_id, project_name)
       
+      vendor_dir = File.expand_path("tmp/debify/#{project_name}/vendor", ENV['HOME'])
+      dot_bundle_dir = File.expand_path("tmp/debify/#{project_name}/.bundle", ENV['HOME'])
+      FileUtils.mkdir_p vendor_dir
+      FileUtils.mkdir_p dot_bundle_dir
       options = {
         'Image' => appliance_image.id,
         'Env' => [
           "CONJUR_AUTHN_LOGIN=admin",
-          "CONJUR_ENV=production",
+          "CONJUR_ENV=appliance",
           "CONJUR_AUTHN_API_KEY=secret",
           "CONJUR_ADMIN_PASSWORD=secret",
         ],
         'Binds' => [
-          [ dir, "/src/#{project_name}" ].join(':')
+          [ dir, "/src/#{project_name}" ].join(':'),
+          [ vendor_dir, "/src/#{project_name}/vendor" ].join(':'),
+          [ dot_bundle_dir, "/src/#{project_name}/.bundle" ].join(':')
         ]
       }
       
@@ -265,6 +296,7 @@ command "test" do |c|
       def command container, *args
         stdout, stderr, exitcode = container.exec args, &DebugMixin::DOCKER
         exit_now! "Command failed : #{args.join(' ')}", exitcode unless exitcode == 0
+        stdout
       end
       
       begin
@@ -275,33 +307,22 @@ command "test" do |c|
         end
         container.start
 
-        DebugMixin.debug_write "Stopping conjur\n"
-
-        container.exec [ "sv", "stop", "conjur" ], &DebugMixin::DOCKER
-        
-        DebugMixin.debug_write "Purging source install of #{project_name}\n"
-        
-        command container, "rm", "-rf", "/opt/conjur/#{project_name}"
-        command container, "rm", "-f", "/opt/conjur/etc/#{project_name}.conf"
-        command container, "rm", "-f", "/usr/local/bin/conjur-#{project_name}"
-        container.exec [ "dpkg", "-P", "conjur-#{project_name}" ], &DebugMixin::DOCKER
-        
-        DebugMixin.debug_write "Installing #{project_name}\n"
+        # Wait for pg/main so that migrations can run
+        30.times do
+          stdout, stderr, exitcode = container.exec %w(sv status pg/main), &DebugMixin::DOCKER
+          status = stdout.join
+          break if exitcode == 0 && status =~ /^run\:/
+          sleep 1
+        end
         
-        command container, "dpkg", "-i", "/src/#{project_name}/conjur-#{project_name}_latest_amd64.deb"
         command container, "/opt/conjur/evoke/bin/test-install", project_name
 
         DebugMixin.debug_write "Starting conjur\n"
 
+        command container, "rm", "/etc/service/conjur/down"
         command container, "sv", "start", "conjur"
         wait_for_conjur appliance_image, container
   
-        if configure_script
-          system "./#{configure_script} #{container.id}"
-          exit_now! "#{configure_script} failed with exit code #{$?.exitstatus}", $?.exitstatus unless $?.exitstatus == 0
-          wait_for_conjur appliance_image, container
-        end
-  
         system "./#{test_script} #{container.id}"
         exit_now! "#{test_script} failed with exit code #{$?.exitstatus}", $?.exitstatus unless $?.exitstatus == 0
       ensure

data/lib/conjur/debify/version.rb

@@ -1,5 +1,5 @@
 module Conjur
   module Debify
-    VERSION = "0.4.1"
+    VERSION = "0.6.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conjur-debify
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Kevin Gilpin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-13 00:00:00.000000000 Z
+date: 2016-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -104,6 +104,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .project
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md