From a7a07fdeaabdf52a9bc008cbd5534f723a18b1fe Mon Sep 17 00:00:00 2001 From: Dustin Collins Date: Mon, 21 May 2018 14:12:04 -0500 Subject: [PATCH] Pin ruby-xz gem in fpm Dockerfile, so it works on Ruby 2.2 --- CHANGELOG.md | 8 ++++++++ VERSION | 2 +- lib/conjur/fpm/Dockerfile | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 85d6385..246420b 100644 --- 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 index 81c871d..5ad2491 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.10.0 +1.10.2 diff --git a/lib/conjur/fpm/Dockerfile b/lib/conjur/fpm/Dockerfile index dafe2c1..bcd066a 100644 --- 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" \