conjur-debify 0.0.1.pre.47 → 0.2.0

data/lib/conjur/fpm/Dockerfile

@@ -1,26 +1,12 @@
-# Build from the same version of ubuntu as phusion/baseimage
-FROM registry.tld/cyberark/phusion-ruby-fips:0.11-9c1da20
+FROM ruby:2.0
 
-RUN apt-get update -y && \
-    apt-get dist-upgrade -y && \
-    apt-get install -y build-essential \
-                       git \
-                       libffi-dev \
-                       rpm
+RUN apt-get update -y && apt-get install -y build-essential
 
-RUN gem install --no-document fpm
-
-ENV GEM_HOME /usr/local/bundle
-ENV BUNDLE_PATH="$GEM_HOME" \
-    BUNDLE_BIN="$GEM_HOME/bin" \
-    BUNDLE_SILENCE_ROOT_WARNING=1
-ENV PATH $BUNDLE_BIN:$PATH
-RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" && \
-    chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
+RUN gem install --no-rdoc --no-ri bundler fpm
 
 RUN mkdir /src
 
-ENTRYPOINT [ "/package.sh" ]
-
 COPY debify_utils.sh /
 COPY package.sh      /
+
+ENTRYPOINT [ "/package.sh" ]

data/lib/conjur/fpm/debify_utils.sh

@@ -1,32 +1,12 @@
 function bundle_clean() {
-  ruby_version="$(ruby -v | grep -o '[0-9]\.[0-9]\.[0-9]')"
+        chmod og+r -R vendor/bundle # some gems have broken perms
 
-  if [ -d vendor/bundle ]; then
-    chmod og+r -R vendor/bundle # some gems have broken perms
+        gem install bundler --no-rdoc --no-ri --install-dir ./vendor/bundle/ruby/2.0.0
 
-    # 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}
-  fi
-}
-
-# Remove files from the current directory that also exist in another given
-# directory. For example, say in the current directory there is:
-#    foo
-#    bar/baz
-#    bar/xyzzy
-#    bacon
-#    people/phlebas
-# and in dir2 there is
-#    bacon
-#    alice
-#    people/phlebas
-#    bar/xyzzy
-# then after running `remove_matching dir2` current directory will be left with only:
-#    foo
-#    bar/baz
-# Note it probably isn't 100% fool-proof, so don't launch it out to space or something.
-function remove_matching() {
-  find "$1" -type f -print0 | sed -ze "s@^$1@.@" | xargs -0 rm -f
-  find . -type d -empty -delete
+        # 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/*
 }

data/lib/conjur/fpm/package.sh

@@ -1,80 +1,28 @@
 #!/bin/bash -ex
 
-source /debify_utils.sh
-
 project_name=$1
 shift
 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
-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
+	echo Version argument is required
+	exit 1
 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
-cd $prefix
-bundle config set --local deployment 'true' && \
-bundle config set --local path 'vendor/bundle' && \
-bundle
-cp -al $prefix /dev-pkg
-bundle config set --local without 'development test'
-bundle clean
-cd /dev-pkg
-remove_matching $prefix
-bundle_clean
-
-if [ $(ls | wc -l) -eq 0 ]; then
-  echo No dev dependencies, skipping dev package
-else
-  echo "Building conjur-$project_name-dev $file_type package"
+package_name=conjur-"$project_name"_"$version"_amd64.deb
 
-  fpm \
-    -s dir \
-    -t $file_type \
-    -n conjur-$project_name-dev \
-    -v $version \
-    -C . \
-    --maintainer "CyberArk Software, Inc." \
-    --vendor "CyberArk Software, Inc." \
-    --license "Proprietary" \
-    --url "https://www.cyberark.com" \
-    --deb-no-default-config-files \
-    --$file_type-user conjur \
-    --$file_type-group conjur \
-    --depends "conjur-$project_name = $version" \
-    --prefix /opt/conjur/$project_name \
-    --description "Conjur $project_name service - development files"
-fi
+echo Building $package_name
 
 mv /src/opt/conjur/project /src/opt/conjur/$project_name
 
 cd /src/opt/conjur/$project_name
 
+source /debify_utils.sh
 bundle_clean
 
 cd /src
@@ -85,23 +33,19 @@ mkdir -p opt/conjur/etc
 
 [ -d opt/conjur/"$project_name"/distrib ] && mv opt/conjur/"$project_name"/distrib /
 
-echo "Building conjur-$project_name $file_type package"
-
-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" \
-  "$@"
-
-ls -l
+fpm -s dir -t deb -n conjur-$project_name -v $version -C . \
+	--maintainer "Conjur Inc." \
+	--vendor "Conjur Inc." \
+	--license "Proprietary" \
+	--url "https://www.conjur.net" \
+	--deb-no-default-config-files \
+	--config-files opt/conjur/etc \
+	--deb-user conjur \
+	--deb-group conjur \
+	--depends ruby2.0 \
+	--description "Conjur $project_name service" \
+	"$@"
+
+ls -al *.deb
+
+cp *.deb /dist/

metadata

@@ -1,236 +1,130 @@
 --- !ruby/object:Gem::Specification
 name: conjur-debify
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre.47
+  version: 0.2.0
 platform: ruby
 authors:
-- CyberArk Software, Inc.
+- Kevin Gilpin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-03 00:00:00.000000000 Z
+date: 2016-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
   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: docker-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: conjur-cli
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6'
-- !ruby/object:Gem::Dependency
-  name: conjur-api
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.2.30
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.2.30
-- !ruby/object:Gem::Dependency
-  name: fakefs
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.10'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.10'
-- !ruby/object:Gem::Dependency
-  name: ci_reporter_rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 description: 
 email:
-- conj_maintainers@cyberark.com
+- kgilpin@conjur.net
 executables:
 - debify
 extensions: []
 extra_rdoc_files: []
 files:
-- ".dockerignore"
-- ".gitignore"
-- ".project"
-- ".rvmrc"
-- CHANGELOG.md
-- CONTRIBUTING.md
-- Dockerfile
+- .gitignore
+- .project
 - Gemfile
-- Jenkinsfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- VERSION
 - bin/debify
-- build.sh
-- ci/test.sh
 - debify.gemspec
-- distrib/conjur_creds.rb
-- distrib/docker-debify
-- distrib/entrypoint.sh
-- distrib/script
-- distrib/secrets
-- distrib/secrets.yml
 - example/Gemfile
 - example/Gemfile.lock
 - example/debify.sh
 - example/distrib/postinstall.sh
-- example/docker-compose.yml
-- example/net-test.sh
 - example/test.sh
-- features/detect_version.feature
-- features/package.feature
-- features/sandbox.feature
+- features/debify.feature
 - features/step_definitions/debify_steps.rb
 - features/support/env.rb
-- features/support/hooks.rb
-- features/support/world.rb
-- features/test.feature
-- image-tags
+- jenkins.sh
 - lib/conjur/debify.rb
 - lib/conjur/debify/Dockerfile.fpm
-- lib/conjur/debify/action/publish.rb
-- lib/conjur/debify/utils.rb
 - lib/conjur/debify/version.rb
 - lib/conjur/fpm/Dockerfile
 - lib/conjur/fpm/debify_utils.sh
 - lib/conjur/fpm/package.sh
-- lib/conjur/publish/Dockerfile
-- publish-rubygem.sh
-- push-image.sh
-- secrets.yml
-- spec/action/publish_spec.rb
-- spec/data/Makefile
-- spec/data/test.tar
-- spec/debify_utils_spec.rb
-- spec/spec_helper.rb
-- spec/utils_spec.rb
-- tag-image.sh
-- test.sh
 homepage: https://github.com/conjurinc/debify
 licenses:
 - MIT
@@ -241,32 +135,22 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Utility commands to build and package Conjur services as Debian packages
 test_files:
-- features/detect_version.feature
-- features/package.feature
-- features/sandbox.feature
+- features/debify.feature
 - features/step_definitions/debify_steps.rb
 - features/support/env.rb
-- features/support/hooks.rb
-- features/support/world.rb
-- features/test.feature
-- spec/action/publish_spec.rb
-- spec/data/Makefile
-- spec/data/test.tar
-- spec/debify_utils_spec.rb
-- spec/spec_helper.rb
-- spec/utils_spec.rb
+has_rdoc: 

data/.dockerignore

@@ -1 +0,0 @@
-Gemfile.lock

data/.rvmrc

@@ -1,60 +0,0 @@
-#!/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