conjur-debify 0.9.2 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9490793d189cb32d4ddf3d97f257653a2bbfda75
-  data.tar.gz: cf247c96de749df2b6f9284217185611b95a8817
+  metadata.gz: 9050f6d1916af0ad40a44f5c3b221a41aec80d9a
+  data.tar.gz: b5d2123fd18a9b3f7073f10ee93570bed63af45e
 SHA512:
-  metadata.gz: 340df04883cd6216536d98d1531e3c75ede04639c8f8ff183ad0a2e119e7f7c9abf14353ecbef2a33d61cdb01f1846baabf3068f79e87a2de07ceabd9a75ac34
-  data.tar.gz: 7e7472d0db4f21305ca9d75a6cedc28bef5a6938d4b2b3246d88efd161e1d84e6e068fe96d6073a92ffd855e41aeb8ebe0eeddc93dd125f83640b52ac0254d6c
+  metadata.gz: a02bb70d225835a4db407aa1067ee8558ff9a3774fbdeae934cb9f934755f693b33ad19b09ef0fae6543f2823edb27e1d0a02d195fb2f02d20029e21b5211c51
+  data.tar.gz: 0520cec8b75bbefa57f836f08fe34c41b90ab083724a18b0ac59fde6a3a4896c2af1b3950efb17ac174b6309aaca9c476ca9a8d7a2c14363dd4330ce4a3e7ecb

data/.rvmrc

@@ -0,0 +1,60 @@
+#!/usr/bin/env bash
+
+# This is an RVM Project .rvmrc file, used to automatically load the ruby
+# development environment upon cd'ing into the directory
+
+# First we specify our desired <ruby>[@<gemset>], the @gemset name is optional,
+# Only full ruby name is supported here, for short names use:
+#     echo "rvm use 2.2.4@debify" > .rvmrc
+environment_id="ruby-2.2.4@debify"
+
+# Uncomment the following lines if you want to verify rvm version per project
+# rvmrc_rvm_version="1.26.11 (latest)" # 1.10.1 seems like a safe start
+# eval "$(echo ${rvm_version}.${rvmrc_rvm_version} | __rvm_awk -F. '{print "[[ "$1*65536+$2*256+$3" -ge "$4*65536+$5*256+$6" ]]"}' )" || {
+#   echo "This .rvmrc file requires at least RVM ${rvmrc_rvm_version}, aborting loading."
+#   return 1
+# }
+
+# First we attempt to load the desired environment directly from the environment
+# file. This is very fast and efficient compared to running through the entire
+# CLI and selector. If you want feedback on which environment was used then
+# insert the word 'use' after --create as this triggers verbose mode.
+if [[ -d "${rvm_path:-$HOME/.rvm}/environments"
+  && -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]]
+then
+  \. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
+  for __hook in "${rvm_path:-$HOME/.rvm}/hooks/after_use"*
+  do
+    if [[ -f "${__hook}" && -x "${__hook}" && -s "${__hook}" ]]
+    then \. "${__hook}" || true
+    fi
+  done
+  unset __hook
+  if (( ${rvm_use_flag:=1} >= 2 )) # display only when forced
+  then
+    if [[ $- == *i* ]] # check for interactive shells
+    then printf "%b" "Using: $(tput setaf 2 2>/dev/null)$GEM_HOME$(tput sgr0 2>/dev/null)\n" # show the user the ruby and gemset they are using in green
+    else printf "%b" "Using: $GEM_HOME\n" # don't use colors in non-interactive shells
+    fi
+  fi
+else
+  # If the environment file has not yet been created, use the RVM CLI to select.
+  rvm --create  "$environment_id" || {
+    echo "Failed to create RVM environment '${environment_id}'."
+    return 1
+  }
+fi
+
+# If you use bundler, this might be useful to you:
+# if [[ -s Gemfile ]] && {
+#   ! builtin command -v bundle >/dev/null ||
+#   builtin command -v bundle | GREP_OPTIONS="" \command \grep $rvm_path/bin/bundle >/dev/null
+# }
+# then
+#   printf "%b" "The rubygem 'bundler' is not installed. Installing it now.\n"
+#   gem install bundler
+# fi
+# if [[ -s Gemfile ]] && builtin command -v bundle >/dev/null
+# then
+#   bundle install | GREP_OPTIONS="" \command \grep -vE '^Using|Your bundle is complete'
+# fi

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 0.10.0
+* Upgrading Ruby for packaging from 2.0 to 2.2.4
+
 # 0.9.2
 
 * Print messages to stderr instead of stdout during packaging

data/lib/conjur/debify.rb

@@ -125,7 +125,8 @@ command "clean" do |c|
           'Image' => image.id,
           'Binds' => [
             [ dir, "/src" ].join(':'),
-          ]
+          ],
+          'Privileged' => true
         }
         container = Docker::Container.create options
         begin
@@ -222,7 +223,8 @@ command "package" do |c|
 
       options = {
         'Cmd'   => [ project_name, version ] + fpm_args,
-        'Image' => image.id
+        'Image' => image.id,
+        'Privileged' => true
       }
       
       container = Docker::Container.create options
@@ -357,7 +359,8 @@ RUN touch /etc/service/conjur/down
           [ dir, "/src/#{project_name}" ].join(':'),
           [ vendor_dir, "/src/#{project_name}/vendor" ].join(':'),
           [ dot_bundle_dir, "/src/#{project_name}/.bundle" ].join(':')
-        ]
+        ],
+        'Privileged' => true
       }
       
       container = Docker::Container.create(options)

data/lib/conjur/debify/version.rb

@@ -1,5 +1,5 @@
 module Conjur
   module Debify
-    VERSION = "0.9.2"
+    VERSION = "0.10.0"
   end
 end

data/lib/conjur/fpm/Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.0
+FROM ruby:2.2.4
 
 RUN apt-get update -y && apt-get install -y build-essential
 

data/lib/conjur/fpm/debify_utils.sh

@@ -1,12 +1,11 @@
 function bundle_clean() {
-        chmod og+r -R vendor/bundle # some gems have broken perms
+  ruby_version="$(ruby -v | grep -o '[0-9]\.[0-9]\.[0-9]')"
 
-        gem install bundler --no-rdoc --no-ri --install-dir ./vendor/bundle/ruby/2.0.0
+  chmod og+r -R vendor/bundle # some gems have broken perms
 
-        # some cleanup
-        rm -rf vendor/bundle/ruby/2.0.0/cache
-        rm -rf vendor/bundle/ruby/2.0.0/gems/*/{test,spec,examples,example,contrib,doc,ext,sample}
-        
-        # Ruby 2.0 is ruby2.0 in ubuntu, fix shebangs
-        sed -i -e '1 c #!/usr/bin/env ruby2.0' vendor/bundle/ruby/2.0.0/bin/*
+  gem install bundler --no-rdoc --no-ri --install-dir ./vendor/bundle/ruby/${ruby_version}
+
+  # some cleanup
+  rm -rf vendor/bundle/ruby/${ruby_version}/cache
+  rm -rf vendor/bundle/ruby/${ruby_version}/gems/*/{test,spec,examples,example,contrib,doc,ext,sample}
 }

data/lib/conjur/publish/Dockerfile

@@ -1,8 +1,12 @@
-FROM ruby:2.0
+FROM alpine:3.3
 
-RUN curl -kL \
--o /usr/bin/art \
-https://bintray.com/artifact/download/jfrog/artifactory-cli-go/1.2.1/artifactory-cli-linux-amd64/art && \
-chmod +x /usr/bin/art
+RUN apk --update upgrade && \
+    apk add ca-certificates && \
+    update-ca-certificates && \
+    rm -rf /var/cache/apk/*
+
+RUN wget -O /usr/bin/art \
+    https://bintray.com/artifact/download/jfrog/artifactory-cli-go/1.2.1/artifactory-cli-linux-amd64/art && \
+    chmod +x /usr/bin/art
 
 WORKDIR /src

metadata

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