conjur-debify 1.10.1 → 1.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 979d401ca7fa9648f2633b05f2e0873a994c7b7d1193781c0721f6e7f2850082
-  data.tar.gz: 86bb4356509d977d921015b054aacf01c95d56ae0125311e16161a6be85f8515
+  metadata.gz: 5f87ebc10c78db4a39ad8d8b211c9b6b07d6068c37d2625eb44f9f7c75e2cf78
+  data.tar.gz: fcd3cc94728f39e000eed291ef7b5d70b63a7912db4c5951b1c9347507c60893
 SHA512:
-  metadata.gz: 5e43272868e7fbf8f6dd5935330c8711231cddc3e6e5e506d5d3798296216a2c4d893de75f93a0213e94811b93825bb1f786da972854c6d15af776b5cc802bc5
-  data.tar.gz: 1b361c89688eff80491cf661c43304f0ba98e7a2a2987160b1854552abaa875e8a282429b202dfac00d5b12dc384786c9a9071145c31b21d4501235297edf962
+  metadata.gz: '081d1c2d58f09b54e736264627d8ac11940b07604d83de23a283d75c21184a209eab8e81ef7aafb4f3888f780866f5bbf43cc0c1457dab7e958116b120ea6ba7'
+  data.tar.gz: 8f999bdc7706bef9b353fc098794ea3c2a8b246fd870fee86a97771665792f177e1cf8110f11837a4012f4fb11f0cc9a5862edee533eda5e0f74957a89e20780

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.10.2
+
+* Pin `ruby-xz` gem in fpm Dockerfile, so it works on Ruby 2.2. Upstream issue: https://github.com/jordansissel/fpm/issues/1493
+
 # 1.10.1
 
 * Update fpm container to use Ruby 2.4, fixes `ruby-xz` dependency

data/VERSION

@@ -1 +1 @@
-1.10.1
+1.10.2

data/lib/conjur/fpm/Dockerfile

@@ -1,13 +1,18 @@
-FROM ruby: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 git libpq5 libpq-dev libffi-dev && \
-    rm -rf /var/lib/apt/lists/*
+    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
 
+
+# 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:$FPM_VERSION
+RUN gem install --no-rdoc --no-ri bundler:$BUNDLER_VERSION ruby-xz:0.2.3 fpm
 
 ENV GEM_HOME /usr/local/bundle
 ENV BUNDLE_PATH="$GEM_HOME" \
@@ -15,10 +20,13 @@ 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" /src \
+RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
 	&& 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 ci/artifactory/users/jenkins/username
-ARTIFACTORY_PASSWORD: !var ci/artifactory/users/jenkins/password
+ARTIFACTORY_USERNAME: !var artifactory/users/jenkins/username
+ARTIFACTORY_PASSWORD: !var artifactory/users/jenkins/password

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conjur-debify
 version: !ruby/object:Gem::Version
-  version: 1.10.1
+  version: 1.10.2
 platform: ruby
 authors:
 - Kevin Gilpin