conjur-debify 1.10.0 → 1.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88040281ebb6c9d449d4d1d76ad5a8336227ddf8c4fe5ec3753d413ff16b47d2
-  data.tar.gz: 98cc9d92be782db60c56ee85c6cdea1eff52733eded68543964f510f37a69e17
+  metadata.gz: 979d401ca7fa9648f2633b05f2e0873a994c7b7d1193781c0721f6e7f2850082
+  data.tar.gz: 86bb4356509d977d921015b054aacf01c95d56ae0125311e16161a6be85f8515
 SHA512:
-  metadata.gz: 5642578c564449462ec292c828a30fa0eeabee0e764bd47b7437564c4be3181808fda0f02fcd516d7aed617c98d50deb062a96b3fb9a5066fae5ba1e1eb130e1
-  data.tar.gz: 05e3bb4cac1d4188b19e84adf42b93e875efd300d725efa04177f0366c1da4de25960fbe417757420406b09a78b895c51a599d8dcd02a602d77218bd72f1e800
+  metadata.gz: 5e43272868e7fbf8f6dd5935330c8711231cddc3e6e5e506d5d3798296216a2c4d893de75f93a0213e94811b93825bb1f786da972854c6d15af776b5cc802bc5
+  data.tar.gz: 1b361c89688eff80491cf661c43304f0ba98e7a2a2987160b1854552abaa875e8a282429b202dfac00d5b12dc384786c9a9071145c31b21d4501235297edf962

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.10.1
+
+* Update fpm container to use Ruby 2.4, fixes `ruby-xz` dependency
+
 # 1.10.0
 
 * add `--net` support to `test` and `sandbox` subcommands

data/README.md

@@ -66,7 +66,7 @@ GLOBAL OPTIONS
 COMMANDS
     clean          - Clean current working directory of non-Git-managed files
     config         - Show the given configuration
-    detect-version - Auto-detect and print the repository verison
+    detect-version - Auto-detect and print the repository version
     help           - Shows a list of commands or help for one command
     initconfig     - Initialize the config file using current global options
     package        - Build a debian package for a project

data/VERSION

@@ -1 +1 @@
-1.10.0
+1.10.1

data/lib/conjur/debify.rb

@@ -726,7 +726,7 @@ command "publish" do |c|
   end
 end
 
-desc "Auto-detect and print the repository verison"
+desc "Auto-detect and print the repository version"
 command "detect-version" do |c|
   c.desc "Set the current working directory"
   c.flag [ :d, :dir ]

data/lib/conjur/fpm/Dockerfile

@@ -1,18 +1,13 @@
-# Build from the same version of ubuntu as phusion/baseimage
-FROM ubuntu:14.04
+FROM ruby:2.4
 
 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 libffi-dev
+    apt-get install -y build-essential git libpq5 libpq-dev libffi-dev && \
+    rm -rf /var/lib/apt/lists/*
 
-
-# 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
+ENV FPM_VERSION 1.9.3
 
-RUN gem install --no-rdoc --no-ri bundler:$BUNDLER_VERSION fpm
+RUN gem install --no-rdoc --no-ri bundler:$BUNDLER_VERSION fpm:$FPM_VERSION
 
 ENV GEM_HOME /usr/local/bundle
 ENV BUNDLE_PATH="$GEM_HOME" \
@@ -20,13 +15,10 @@ ENV BUNDLE_PATH="$GEM_HOME" \
 	BUNDLE_SILENCE_ROOT_WARNING=1 \
 	BUNDLE_APP_CONFIG="$GEM_HOME"
 ENV PATH $BUNDLE_BIN:$PATH
-RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
+RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" /src \
 	&& chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
 
-RUN mkdir /src
-
-ENTRYPOINT [ "/package.sh" ]
-
 COPY debify_utils.sh /
 COPY package.sh      /
 
+ENTRYPOINT [ "/package.sh" ]

data/secrets.yml

@@ -1,3 +1,3 @@
 # Example of secrets.yml file needed for debify publish
-ARTIFACTORY_USERNAME: !var artifactory/users/jenkins/username
-ARTIFACTORY_PASSWORD: !var artifactory/users/jenkins/password
+ARTIFACTORY_USERNAME: !var ci/artifactory/users/jenkins/username
+ARTIFACTORY_PASSWORD: !var ci/artifactory/users/jenkins/password

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conjur-debify
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.10.1
 platform: ruby
 authors:
 - Kevin Gilpin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-19 00:00:00.000000000 Z
+date: 2018-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli