conjur-debify 1.12.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b5fa10a6d866735c45f5edfd2a9defcc685ebe502c8950b219b6a8bc22ed232
-  data.tar.gz: 169e5c66e12fe3533c778255b337ad64b323f35cbc298f8e39c00e7abe765b7f
+  metadata.gz: 6f76a5ea0e2c4fc01e0666594176690174cf1894f478570118056908c03c5e81
+  data.tar.gz: ebdb065547d044394079979326f759118e264a640a5feb41341fdba6386de661
 SHA512:
-  metadata.gz: f9326cdb7fd4efafc3db3dda92e6a313cfc504dc34a24450be1076078cc8124b93c8f8ab781f59434cf625c4a37e2a1e8e6b1ead7466a7df00c2de7e3c3cca30
-  data.tar.gz: 8aae92edeacc8a8ffecaa7bbe4bf09cbb0a0f797b40c4cc8e52e4b9999cd7f607a58a913334e5f82cdcabfe07cc94ab2803bce65b3e99e0b84a0ed23d56824d6
+  metadata.gz: ed14d2fecc7c4229f8c3c59d289acd39b7defd6c046b5417d332d7adfe6b921cdc5dc16b81f95825b07e9d595f92ecc7924508fc0529f6ccce00bd182e0d8f65
+  data.tar.gz: 9c8aaaa932d2971d549a2db859c2e47c16f26890fc25ed6491c5cd854fb4d363af289312947e5f9deb950d55b044a6bc32158472445c391241bd19604d7a5725

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## [Unreleased]
 
+# 2.0.0
+### Changed
+- Debify now receives the flag `--output` as input to indicate the file type that it should package (e.g `rpm`). If this 
+  flag is not given, the default value is `deb`.
+  [conjurinc/debify#56](https://github.com/conjurinc/debify/issues/56)
+
 # 1.12.0
 
 ### Added

data/Dockerfile

@@ -1,32 +1,18 @@
 FROM ruby:2.6-stretch
 
-### DockerInDocker support is take from
-### https://github.com/jpetazzo/dind/blob/master/Dockerfile . I
-### elected to base this image on ruby, then pull in the (slightly
-### outdated) support for DockerInDocker. Creation of the official
-### docker:dind image much more complicated and didn't lend itself to
-### also running ruby.
-
 RUN apt-get update -qq && \
     apt-get dist-upgrade -qqy && \
     apt-get install -qqy \
     apt-transport-https \
     ca-certificates \
-    curl \
-    lxc \
-    iptables
+    curl
     
-# Install Docker from Docker Inc. repositories.
-RUN curl -sSL https://get.docker.com/ | sh
-
-# Install the magic wrapper.
-RUN curl -sSL -o /usr/local/bin/wrapdocker https://raw.githubusercontent.com/jpetazzo/dind/master/wrapdocker
-RUN chmod +x /usr/local/bin/wrapdocker
-
-# Define additional metadata for our image.
-VOLUME /var/lib/docker
-
-### End of DockerInDocker support
+# Install Docker client tools
+ENV DOCKERVERSION=20.10.0
+RUN curl -fsSLO https://download.docker.com/linux/static/stable/x86_64/docker-${DOCKERVERSION}.tgz \
+  && tar xzvf docker-${DOCKERVERSION}.tgz --strip 1 \
+                 -C /usr/local/bin docker/docker \
+  && rm docker-${DOCKERVERSION}.tgz
 
 RUN mkdir -p /debify
 WORKDIR /debify

data/Rakefile

@@ -33,7 +33,8 @@ if cucumber?
   Cucumber::Rake::Task.new(:features) do |t|
     opts = "features --format junit -o #{CUKE_RESULTS} --format pretty -x"
     opts += " --tags #{ENV['TAGS']}" if ENV['TAGS']
-    t.cucumber_opts =  opts
+    opts += " --tags ~@skip"
+    t.cucumber_opts = opts
     t.fork = false
   end
 

data/VERSION

@@ -1 +1 @@
-1.12.0
+2.0.0

data/ci/test.sh

@@ -2,11 +2,6 @@
 
 bundle
 
-# Some tests need to be logged in to the registry, to pull a base
-# image if it's not already available. Have entrypoint.sh do something
-# simple, and log in as a side effect.
-/debify/distrib/entrypoint.sh detect-version
-
 for target in spec cucumber; do
   bundle exec rake $target
 done

data/distrib/entrypoint.sh

@@ -6,17 +6,14 @@ set +x
 
 creds=( $(ruby /debify/distrib/conjur_creds.rb) )
 
-# If there are creds, use them to log in to the registry. Then, run
-# the magic DockerInDocker wrapper script so debify can interact with
-# the Docker daemon.
+# If there are creds, use them to log in to the registry.
 #
-# If there are no creds, just run debify itself. Any commands that do
+# If there are no creds, any commands that do
 # Docker stuff will fail, but the non-Docker commands (e.g. the config
 # subcommands) will work fine.
 if [[ ${#creds[*]} > 0 ]]; then
   echo -n "${creds[1]}" | docker login registry.tld -u ${creds[0]} --password-stdin >/dev/null 2>&1
-  exec wrapdocker debify "$@"
-else
-  exec debify "$@"
 fi
 
+exec debify "$@"
+

data/features/package.feature

@@ -1,3 +1,4 @@
+@skip
 @announce-output
 Feature: Packaging
 

data/features/sandbox.feature

@@ -2,6 +2,10 @@
 Feature: Running a sandbox
   Background:
     Given I successfully run `docker pull registry.tld/conjur-appliance-cuke-master:4.9-stable`
+    # The extra containers will use the `alpine` image, so we need to pull it first on the
+    # host to use the authenticated DockerHub connection. This avoids hitting DockerHub
+    # rate limits.
+    And I successfully run `docker pull alpine`
 
   Scenario: sandbox for 'example' project be started
     Given I successfully start a sandbox for "example" with arguments "-t 4.9-stable --no-pull"

data/features/step_definitions/debify_steps.rb

@@ -12,11 +12,10 @@ When /^I start a container named "(.*?)"(?: on network "(.*?)")*$/ do |name, net
     networks << network
   end
   
-  alpine = Docker::Image.create('fromImage' => 'alpine')
   options = {
     'name' => name,
     'Cmd' => [ "sh", "-c", "while true; do sleep 1; done" ],
-    'Image' => alpine.id
+    'Image' => 'alpine'
   }
   options['HostConfig'] = { 'NetworkMode' => net_name } if net_name
     

data/lib/conjur/debify.rb

@@ -13,6 +13,8 @@ require 'active_support/core_ext'
 
 include GLI::App
 
+DEFAULT_FILE_TYPE = "deb"
+
 config_file '.debifyrc'
 
 desc 'Set an environment variable (e.g. TERM=xterm) when starting a container'
@@ -50,7 +52,7 @@ module DebugMixin
     if a.length == 2 && a[0].is_a?(Symbol)
       debug a.last
     else
-       a.each do |line|
+      a.each do |line|
         begin
           line = JSON.parse(line)
           line.keys.each do |k|
@@ -80,7 +82,7 @@ def detect_version
     base_version = File.read("VERSION").strip
     commits_since = `git log #{base_commit}..HEAD --pretty='%h'`.split("\n").size
     hash = `git rev-parse --short HEAD`.strip
-    [ [ base_version, commits_since ].join('.'), hash ].join("-")
+    [[base_version, commits_since].join('.'), hash].join("-")
   else
     `git describe --long --tags --abbrev=7 --match 'v*.*.*' | sed -e 's/^v//'`.strip.tap do |version|
       raise "No Git version (tag) for project" if version.empty?
@@ -125,15 +127,15 @@ DESC
 arg_name "project-name -- <fpm-arguments>"
 command "clean" do |c|
   c.desc "Set the current working directory"
-  c.flag [ :d, "dir" ]
+  c.flag [:d, "dir"]
 
   c.desc "Ignore (don't delete) a file or directory"
-  c.flag [ :i, :ignore ]
+  c.flag [:i, :ignore]
 
   c.desc "Force file deletion even if if this doesn't look like a Jenkins environment"
-  c.switch [ :force ]
+  c.switch [:force]
 
-  c.action do |global_options,cmd_options,args|
+  c.action do |global_options, cmd_options, args|
     def looks_like_jenkins?
       require 'etc'
       Etc.getlogin == 'jenkins' && ENV['BUILD_NUMBER']
@@ -144,10 +146,10 @@ command "clean" do |c|
     if !perform_deletion
       $stderr.puts "No --force, and this doesn't look like Jenkins. I won't actually delete anything"
     end
-    @ignore_list = Array(cmd_options[:ignore]) + [ '.', '..', '.git' ]
+    @ignore_list = Array(cmd_options[:ignore]) + ['.', '..', '.git']
 
     def ignore_file? f
-      @ignore_list.find{|ignore| f.index(ignore) == 0}
+      @ignore_list.find { |ignore| f.index(ignore) == 0 }
     end
 
     dir = cmd_options[:dir] || '.'
@@ -160,16 +162,16 @@ command "clean" do |c|
       end
       find_files.compact!
       delete_files = (find_files - git_files)
-      delete_files.delete_if{|file|
+      delete_files.delete_if { |file|
         File.directory?(file) || ignore_file?(file)
       }
       if perform_deletion
         image = Docker::Image.create 'fromImage' => "alpine:3.3"
         options = {
-          'Cmd'   => [ "sh", "-c", "while true; do sleep 1; done" ],
+          'Cmd' => ["sh", "-c", "while true; do sleep 1; done"],
           'Image' => image.id,
           'Binds' => [
-            [ dir, "/src" ].join(':'),
+            [dir, "/src"].join(':'),
           ]
         }
         options['Privileged'] = true if Docker.version['Version'] >= '1.10.0'
@@ -180,7 +182,7 @@ command "clean" do |c|
             puts file
 
             file = "/src/#{file}"
-            cmd = [ "rm", "-f", file ]
+            cmd = ["rm", "-f", file]
 
             stdout, stderr, status = container.exec cmd, &DebugMixin::DOCKER
             $stderr.puts "Failed to delete #{file}" unless status == 0
@@ -232,18 +234,21 @@ DESC
 arg_name "project-name -- <fpm-arguments>"
 command "package" do |c|
   c.desc "Set the current working directory"
-  c.flag [ :d, "dir" ]
+  c.flag [:d, "dir"]
+
+  c.desc "Set the output file type of the fpm command (e.g rpm)"
+  c.flag [:o, :output]
 
   c.desc "Specify the deb version; by default, it's read from the VERSION file"
-  c.flag [ :v, :version ]
+  c.flag [:v, :version]
 
   c.desc "Specify a custom Dockerfile.fpm"
-  c.flag [ :dockerfile]
+  c.flag [:dockerfile]
 
   c.desc "Specify files to add to the FPM image that are not included from the git repo"
-  c.flag [ :'additional-files' ]
+  c.flag [:'additional-files']
 
-  c.action do |global_options,cmd_options,args|
+  c.action do |global_options, cmd_options, args|
     raise "project-name is required" unless project_name = args.shift
 
     fpm_args = []
@@ -279,23 +284,29 @@ command "package" do |c|
         FileUtils.mkdir_p(File.dirname(destination_path))
         FileUtils.cp(original_file, destination_path)
       end
-      
+
       # rename specified dockerfile to 'Dockerfile' during copy, incase name is different
       dockerfile_path = cmd_options[:dockerfile] || File.expand_path("debify/Dockerfile.fpm", pwd)
       temp_dockerfile = File.join(temp_dir, "Dockerfile")
-      
+
       # change image variable in specified Dockerfile
       dockerfile = File.read(dockerfile_path)
       replace_image = dockerfile.gsub("@@image@@", fpm_image.id)
-      File.open(temp_dockerfile, "w") {|file| file.puts replace_image}
+      File.open(temp_dockerfile, "w") { |file| file.puts replace_image }
 
       # build image from project being debified dir
       image = Docker::Image.build_from_dir temp_dir, &DebugMixin::DOCKER
 
       DebugMixin.debug_write "Built fpm image '#{image.id}' for project #{project_name}\n"
 
+      container_cmd_options = [project_name, version]
+
+      # Set the output file type if present
+      file_type = cmd_options[:output] || DEFAULT_FILE_TYPE
+      container_cmd_options << "--file-type=#{file_type}"
+
       options = {
-        'Cmd'   => [ project_name, version ] + fpm_args,
+        'Cmd' => container_cmd_options + fpm_args,
         'Image' => image.id
       }
       options['Privileged'] = true if Docker.version['Version'] >= '1.10.0'
@@ -307,21 +318,23 @@ command "package" do |c|
         status = container.wait
         raise "Failed to package #{project_name}" unless status['StatusCode'] == 0
 
-        # Copy deb packages
-        copy_packages_from_container(
-          container,
-          "conjur-#{project_name}_#{version}_amd64.deb",
-          "conjur-#{project_name}-dev_#{version}_amd64.deb"
-        )
-
-        # Copy rpm packages
-        # The rpm builder replaces dashes with underscores in the version
-        rpm_version = version.tr('-', '_')
-        copy_packages_from_container(
-          container,
-          "conjur-#{project_name}-#{rpm_version}-1.x86_64.rpm",
-          "conjur-#{project_name}-dev-#{rpm_version}-1.x86_64.rpm"
-        )
+        if file_type == "deb"
+          # Copy deb packages
+          copy_packages_from_container(
+            container,
+            "conjur-#{project_name}_#{version}_amd64.deb",
+            "conjur-#{project_name}-dev_#{version}_amd64.deb"
+          )
+        elsif file_type == "rpm"
+          # Copy rpm packages
+          # The rpm builder replaces dashes with underscores in the version
+          rpm_version = version.tr('-', '_')
+          copy_packages_from_container(
+            container,
+            "conjur-#{project_name}-#{rpm_version}-1.x86_64.rpm",
+            "conjur-#{project_name}-dev-#{rpm_version}-1.x86_64.rpm"
+          )
+        end
       ensure
         container.delete(force: true)
       end
@@ -344,10 +357,10 @@ end
 
 def network_options(cmd)
   cmd.desc "Specify link for test container"
-  cmd.flag [ :l, :link ], :multiple => true
+  cmd.flag [:l, :link], :multiple => true
 
   cmd.desc 'Attach to the specified network'
-  cmd.flag [ :n, :net ]
+  cmd.flag [:n, :net]
 end
 
 def short_id(id)
@@ -363,7 +376,7 @@ end
 # instead. (Docker doesn't add full container ids as network aliases,
 # only short ids).
 def shorten_source_id(link)
-  src,dest = link.split(':')
+  src, dest = link.split(':')
   src && dest ? "#{short_id(src)}:#{dest}" : link
 end
 
@@ -413,32 +426,32 @@ DESC
 arg_name "project-name test-script"
 command "test" do |c|
   c.desc "Set the current working directory"
-  c.flag [ :d, :dir ]
+  c.flag [:d, :dir]
 
   c.desc "Keep the Conjur appliance container after the command finishes"
   c.default_value false
-  c.switch [ :k, :keep ]
+  c.switch [:k, :keep]
 
   c.desc "Image name"
   c.default_value "registry.tld/conjur-appliance-cuke-master"
-  c.flag [ :i, :image ]
+  c.flag [:i, :image]
 
   c.desc "Image tag, e.g. 4.5-stable, 4.6-stable"
-  c.flag [ :t, "image-tag"]
+  c.flag [:t, "image-tag"]
 
   c.desc "'docker pull' the Conjur container image"
   c.default_value true
-  c.switch [ :pull ]
+  c.switch [:pull]
 
   c.desc "Specify the deb version; by default, it's read from the VERSION file"
-  c.flag [ :v, :version ]
+  c.flag [:v, :version]
 
   c.desc "Specify volume for test container"
-  c.flag [ :'volumes-from' ], :multiple => true
+  c.flag [:'volumes-from'], :multiple => true
 
   network_options(c)
 
-  c.action do |global_options,cmd_options,args|
+  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
     raise "Received extra command-line arguments" if args.shift
@@ -451,7 +464,7 @@ 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(":")
+      appliance_image_id = [cmd_options[:image], image_tag].join(":")
       version = cmd_options[:version] || detect_version
       package_name = "conjur-#{project_name}_#{version}_amd64.deb"
       dev_package_name = "conjur-#{project_name}-dev_#{version}_amd64.deb"
@@ -459,7 +472,7 @@ command "test" do |c|
       raise "#{test_script} does not exist or is not a file" unless File.file?(test_script)
 
       begin
-        tries ||=2
+        tries ||= 2
         Docker::Image.create 'fromImage' => appliance_image_id, &DebugMixin::DOCKER if cmd_options[:pull]
       rescue
         login_to_registry appliance_image_id
@@ -498,7 +511,7 @@ RUN touch /etc/service/conjur/down
       packages << dev_package_name if File.exist? dev_package_name
 
       begin
-        tries ||=2
+        tries ||= 2
         appliance_image = build_test_image(appliance_image_id, project_name, packages)
       rescue
         login_to_registry appliance_image_id
@@ -519,7 +532,7 @@ RUN touch /etc/service/conjur/down
         ] + global_options[:env],
         'HostConfig' => {
           'Binds' => [
-            [ dir, "/src/#{project_name}" ].join(':')
+            [dir, "/src/#{project_name}"].join(':')
           ]
         }
       }
@@ -532,16 +545,16 @@ RUN touch /etc/service/conjur/down
 
       if global_options[:'local-bundle']
         host_config['Binds']
-          .push([ vendor_dir, "/src/#{project_name}/vendor" ].join(':'))
-          .push([ dot_bundle_dir, "/src/#{project_name}/.bundle" ].join(':'))
+          .push([vendor_dir, "/src/#{project_name}/vendor"].join(':'))
+          .push([dot_bundle_dir, "/src/#{project_name}/.bundle"].join(':'))
       end
 
-      container = Docker::Container.create(options.tap {|o| DebugMixin.debug_write "creating container with options #{o.inspect}"})
+      container = Docker::Container.create(options.tap { |o| DebugMixin.debug_write "creating container with options #{o.inspect}" })
 
       begin
         DebugMixin.debug_write "Testing #{project_name} in container #{container.id}\n"
 
-        spawn("docker logs -f #{container.id}", [ :out, :err ] => $stderr).tap do |pid|
+        spawn("docker logs -f #{container.id}", [:out, :err] => $stderr).tap do |pid|
           Process.detach pid
         end
         container.start!
@@ -592,29 +605,29 @@ Once in the container, use "/opt/conjur/evoke/bin/dev-install" to install the de
 DESC
 command "sandbox" do |c|
   c.desc "Set the current working directory"
-  c.flag [ :d, :dir ]
+  c.flag [:d, :dir]
 
   c.desc "Image name"
   c.default_value "registry.tld/conjur-appliance-cuke-master"
-  c.flag [ :i, :image ]
+  c.flag [:i, :image]
 
   c.desc "Image tag, e.g. 4.5-stable, 4.6-stable"
-  c.flag [ :t, "image-tag"]
+  c.flag [:t, "image-tag"]
 
   c.desc "Bind another source directory into the container. Use <src>:<dest>, where both are full paths."
-  c.flag [ :"bind" ], :multiple => true
+  c.flag [:"bind"], :multiple => true
 
   c.desc "'docker pull' the Conjur container image"
   c.default_value false
-  c.switch [ :pull ]
+  c.switch [:pull]
 
   network_options(c)
 
   c.desc "Specify volume for container"
-  c.flag [ :'volumes-from' ], :multiple => true
+  c.flag [:'volumes-from'], :multiple => true
 
   c.desc "Expose a port from the container to host. Use <host>:<container>."
-  c.flag [ :p, :port ], :multiple => true
+  c.flag [:p, :port], :multiple => true
 
   c.desc 'Run dev-install in /src/<project-name>'
   c.default_value false
@@ -625,9 +638,9 @@ command "sandbox" do |c|
   c.switch [:kill]
 
   c.desc 'A command to run in the sandbox'
-  c.flag [ :c, :command ]
+  c.flag [:c, :command]
 
-  c.action do |global_options,cmd_options,args|
+  c.action do |global_options, cmd_options, args|
     raise "Received extra command-line arguments" if args.shift
 
     dir = cmd_options[:dir] || '.'
@@ -637,11 +650,11 @@ command "sandbox" 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(":")
+      appliance_image_id = [cmd_options[:image], image_tag].join(":")
 
       appliance_image = if cmd_options[:pull]
         begin
-          tries ||=2
+          tries ||= 2
           Docker::Image.create 'fromImage' => appliance_image_id, &DebugMixin::DOCKER if cmd_options[:pull]
         rescue
           login_to_registry appliance_image_id
@@ -671,14 +684,14 @@ command "sandbox" do |c|
 
       options['HostConfig'] = host_config = {}
       host_config['Binds'] = [
-        [ File.expand_path(".ssh/id_rsa", ENV['HOME']), "/root/.ssh/id_rsa", 'ro' ].join(':'),
-        [ dir, "/src/#{project_name}" ].join(':'),
+        [File.expand_path(".ssh/id_rsa", ENV['HOME']), "/root/.ssh/id_rsa", 'ro'].join(':'),
+        [dir, "/src/#{project_name}"].join(':'),
       ] + Array(cmd_options[:bind])
 
       if global_options[:'local-bundle']
         host_config['Binds']
-          .push([ vendor_dir, "/src/#{project_name}/vendor" ].join(':'))
-          .push([ dot_bundle_dir, "/src/#{project_name}/.bundle" ].join(':'))
+          .push([vendor_dir, "/src/#{project_name}/vendor"].join(':'))
+          .push([dot_bundle_dir, "/src/#{project_name}/.bundle"].join(':'))
       end
 
       host_config['Privileged'] = true if Docker.version['Version'] >= '1.10.0'
@@ -690,7 +703,7 @@ command "sandbox" do |c|
         port_bindings = Hash.new({})
         cmd_options[:port].each do |mapping|
           hport, cport = mapping.split(':')
-          port_bindings["#{cport}/tcp"] = [{ 'HostPort' => hport }]
+          port_bindings["#{cport}/tcp"] = [{'HostPort' => hport}]
         end
         host_config['PortBindings'] = port_bindings
       end
@@ -700,7 +713,7 @@ command "sandbox" do |c|
         previous.delete(:force => true) if previous
       end
 
-      container = Docker::Container.create(options.tap {|o| DebugMixin.debug_write "creating container with options #{o.inspect}"})
+      container = Docker::Container.create(options.tap { |o| DebugMixin.debug_write "creating container with options #{o.inspect}" })
       $stdout.puts container.id
       container.start!
 
@@ -736,27 +749,27 @@ DESC
 arg_name "distribution project-name"
 command "publish" do |c|
   c.desc "Set the current working directory"
-  c.flag [ :d, :dir ]
+  c.flag [:d, :dir]
 
   c.desc "Specify the deb package version; by default, it's computed automatically"
-  c.flag [ :v, :version ]
+  c.flag [:v, :version]
 
   c.desc "Component to publish to, either 'stable' or the name of the git branch"
-  c.flag [ :c, :component ]
+  c.flag [:c, :component]
 
   c.desc "Artifactory URL to publish to"
   c.default_value "https://conjurinc.jfrog.io/conjurinc"
-  c.flag [ :u, :url]
+  c.flag [:u, :url]
 
   c.desc "Artifactory Debian repo to publish package to"
   c.default_value "debian-private"
-  c.flag [ :r, :repo]
+  c.flag [:r, :repo]
 
   c.desc "Artifactory RPM repo to publish package to"
   c.default_value "redhat-private"
   c.flag ['rpm-repo']
 
-  c.action do |global_options,cmd_options,args|
+  c.action do |global_options, cmd_options, args|
     require 'conjur/debify/action/publish'
     raise "distribution is required" unless distribution = args.shift
     raise "project-name is required" unless project_name = args.shift
@@ -769,8 +782,8 @@ end
 desc "Auto-detect and print the repository version"
 command "detect-version" do |c|
   c.desc "Set the current working directory"
-  c.flag [ :d, :dir ]
-  c.action do |global_options,cmd_options,args|
+  c.flag [:d, :dir]
+  c.action do |global_options, cmd_options, args|
     raise "Received extra command-line arguments" if args.shift
 
     dir = cmd_options[:dir] || '.'
@@ -787,7 +800,7 @@ end
 desc 'Show the given configuration'
 arg_name 'configuration'
 command 'config' do |c|
-  c.action do |_,_,args|
+  c.action do |_, _, args|
     raise 'no configuration provided' unless config = args.shift
     raise "Received extra command-line arguments" if args.shift
 
@@ -798,7 +811,7 @@ command 'config' do |c|
 end
 
 
-pre do |global,command,options,args|
+pre do |global, command, options, args|
   # Pre logic here
   # Return true to proceed; false to abort and not call the
   # chosen command
@@ -807,7 +820,7 @@ pre do |global,command,options,args|
   true
 end
 
-post do |global,command,options,args|
+post do |global, command, options, args|
   # Post logic here
   # Use skips_post before a command to skip this
   # block on that command only

data/lib/conjur/fpm/package.sh

@@ -8,14 +8,33 @@ version=$1
 shift
 
 if [ -z "$project_name" ]; then
-	echo Project name argument is required
-	exit 1
+  echo Project name argument is required
+  exit 1
 fi
 if [ -z "$version" ]; then
-	echo Version argument is required
-	exit 1
+  echo Version argument is required
+  exit 1
 fi
 
+for i in "$@"; do
+  case $i in
+  -ft=* | --file-type=*)
+    file_type="${i#*=}"
+    shift
+    ;;
+  esac
+done
+
+if [ -z "$file_type" ]; then
+  echo "No file type given. Using deb"
+  file_type=deb
+fi
+
+echo Project Name is $project_name
+echo Version is $version
+echo file_type is $file_type
+echo params at the end are $@
+
 # Build dev package first
 prefix=/src/opt/conjur/project
 cp -al $prefix /dev-pkg
@@ -27,14 +46,12 @@ cd /dev-pkg
 remove_matching $prefix
 bundle_clean
 
-if [ `ls | wc -l` -eq 0 ]; then
+if [ $(ls | wc -l) -eq 0 ]; then
   echo No dev dependencies, skipping dev package
 else
-  for file_type in deb rpm
-  do
-    echo "Building conjur-$project_name-dev $file_type package"
+  echo "Building conjur-$project_name-dev $file_type package"
 
-    fpm \
+  fpm \
     -s dir \
     -t $file_type \
     -n conjur-$project_name-dev \
@@ -50,7 +67,6 @@ else
     --depends "conjur-$project_name = $version" \
     --prefix /opt/conjur/$project_name \
     --description "Conjur $project_name service - development files"
-  done
 fi
 
 mv /src/opt/conjur/project /src/opt/conjur/$project_name
@@ -67,26 +83,23 @@ mkdir -p opt/conjur/etc
 
 [ -d opt/conjur/"$project_name"/distrib ] && mv opt/conjur/"$project_name"/distrib /
 
-for file_type in deb rpm
-do
-  echo "Building conjur-$project_name-dev $file_type package"
+echo "Building conjur-$project_name-dev $file_type package"
 
-  fpm \
+fpm \
   -s dir \
   -t $file_type \
   -n conjur-$project_name \
   -v $version \
   -C . \
-	--maintainer "CyberArk Software, Inc." \
-	--vendor "CyberArk Software, Inc." \
-	--license "Proprietary" \
-	--url "https://www.cyberark.com" \
-	--config-files opt/conjur/etc \
-	--deb-no-default-config-files \
-	--$file_type-user conjur \
-	--$file_type-group conjur \
-	--description "Conjur $project_name service" \
-	"$@"
-done
-
-ls -al *.{deb,rpm}
+  --maintainer "CyberArk Software, Inc." \
+  --vendor "CyberArk Software, Inc." \
+  --license "Proprietary" \
+  --url "https://www.cyberark.com" \
+  --config-files opt/conjur/etc \
+  --deb-no-default-config-files \
+  --$file_type-user conjur \
+  --$file_type-group conjur \
+  --description "Conjur $project_name service" \
+  "$@"
+
+ls -l

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conjur-debify
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 2.0.0
 platform: ruby
 authors:
 - CyberArk Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-17 00:00:00.000000000 Z
+date: 2020-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli