Pin ruby-xz gem in fpm Dockerfile, so it works on Ruby 2.2

conjurinc · May 21, 2018 · a7a07fd · a7a07fd
1 parent 77faa18
commit a7a07fd
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# 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
+
 # 1.10.0
 
 * add `--net` support to `test` and `sandbox` subcommands

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.10.0
+1.10.2
diff --git a/lib/conjur/fpm/Dockerfile b/lib/conjur/fpm/Dockerfile
@@ -12,7 +12,7 @@ RUN apt-get update -y && \
 # https://github.com/docker-library/ruby/commit/c88f3a67da720bfa9fb1717960d90fd5db11c757
 ENV BUNDLER_VERSION 1.11.2
 
-RUN gem install --no-rdoc --no-ri bundler:$BUNDLER_VERSION fpm
+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" \