conjur-debify 0.11.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78917789d9da713b2e98a491456b69d07252e735
-  data.tar.gz: 61ac786410504111370c50e72c7b86074e69168f
+  metadata.gz: 45c3f31195f67e19a4a873ae02840341359c7cae
+  data.tar.gz: d9c911de42f4f6d74b8c914ea6b0270847aba71c
 SHA512:
-  metadata.gz: 5eefdfdae70c3fa8d5ba418751e2931d2b3e951b13f256c4a2e5c5ee0dd79225506e4b95784c8f43906fdd856ffce7d4bf74e8b8b21956291ae45a9800a4789d
-  data.tar.gz: 7d577222d5d3dfb5777fdfa0ff13a3615142d4a8b688038c1604a23141021cd838c8676479420484a3b759276e67077d3c20625b028f6b4d578a4340593c680c
+  metadata.gz: 68eabdc03f12982d3f617138c65ee2692574a87ec868b28d5cac1d31457803ca27870686f24509b8c1d145c018e77d9154d93aa68dda97443c1a1767ba91fba7
+  data.tar.gz: 6100c22bdac5930aca377b2191822da5c229965a197f5a4cb6fdee002ab52bb1ec32045bd24b9f99cad3ef755531ac83271fbc4f28057c7323792eeee656023a

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+# 1.0.0
+
+* Base image used for packaging on Ubuntu 14.04 
+* Install ruby2.2 and related packages
+
+# 0.11.1
+
+* Add `name` and `Workingdir` options to the sandbox container.
+
 # 0.11.0
 
 * Add `debify sandbox`.

data/lib/conjur/debify.rb

@@ -483,8 +483,9 @@ command "sandbox" do |c|
       FileUtils.mkdir_p dot_bundle_dir
       
       options = {
+        'name' => "#{project_name}-sandbox", 
         'Image' => appliance_image.id,
-        'Name' => "#{project_name}-sandbox", 
+        'WorkingDir' => "/src/#{project_name}",
         'Env' => [
           "CONJUR_AUTHN_LOGIN=admin",
           "CONJUR_ENV=appliance",
@@ -496,19 +497,14 @@ command "sandbox" do |c|
           [ dir, "/src/#{project_name}" ].join(':'),
           [ vendor_dir, "/src/#{project_name}/vendor" ].join(':'),
           [ dot_bundle_dir, "/src/#{project_name}/.bundle" ].join(':')
-        ].concat(Array(cmd_options[:bind]))
+        ] + Array(cmd_options[:bind])
       }
       options['Privileged'] = true if Docker.version['Version'] >= '1.10.0'
-      
+
       container = Docker::Container.create(options)
       $stdout.puts container.id
-      
-      spawn("docker logs -f #{container.id}", [ :out, :err ] => $stderr).tap do |pid|
-        Process.detach pid
-      end
       container.start
 
-      container_command container, %w(apt-get install -y git)
       wait_for_conjur appliance_image, container
     end
   end

data/lib/conjur/debify/version.rb

@@ -1,5 +1,5 @@
 module Conjur
   module Debify
-    VERSION = "0.11.0"
+    VERSION = "1.0.0"
   end
 end

data/lib/conjur/fpm/Dockerfile

@@ -1,9 +1,28 @@
-FROM ruby:2.2.4
+# Build from the same version of ubuntu as phusion/baseimage
+FROM ubuntu:14.04
 
-RUN apt-get update -y && apt-get install -y build-essential
+RUN apt-get update -y && \
+    apt-get install -y software-properties-common && \
+    apt-add-repository -y ppa:brightbox/ruby-ng && \
+    apt-get update -y && \
+    apt-get install -y build-essential git libpq5 libpq-dev ruby2.2 ruby2.2-dev
+
+
+# Configure bundler and gem the way the ruby:2.2 Dockerfile does, as of 
+# https://github.com/docker-library/ruby/commit/c88f3a67da720bfa9fb1717960d90fd5db11c757
+ENV BUNDLER_VERSION 1.11.2
 
 RUN gem install --no-rdoc --no-ri bundler fpm
 
+ENV GEM_HOME /usr/local/bundle
+ENV BUNDLE_PATH="$GEM_HOME" \
+	BUNDLE_BIN="$GEM_HOME/bin" \
+	BUNDLE_SILENCE_ROOT_WARNING=1 \
+	BUNDLE_APP_CONFIG="$GEM_HOME"
+ENV PATH $BUNDLE_BIN:$PATH
+RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
+	&& chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
+
 RUN mkdir /src
 
 COPY debify_utils.sh /

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conjur-debify
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Kevin Gilpin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-14 00:00:00.000000000 Z
+date: 2016-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli