From 00c0c9046375c464abd33100535823281194379f Mon Sep 17 00:00:00 2001 From: Jonathan Curran Date: Tue, 2 Jun 2020 10:57:53 -0600 Subject: [PATCH] Fix ffi version for older distros where ruby<2.3 --- builder/Dockerfile.centos-6 | 2 +- builder/Dockerfile.centos-7 | 2 +- builder/Dockerfile.opensuse-42 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/builder/Dockerfile.centos-6 b/builder/Dockerfile.centos-6 index 1d72685..18bced7 100644 --- a/builder/Dockerfile.centos-6 +++ b/builder/Dockerfile.centos-6 @@ -206,7 +206,7 @@ RUN source /etc/profile.d/rvm.sh \ RUN export PATH=/usr/local/rvm/rubies/ruby-2.6.3/bin/:/.gems/bin:${PATH} \ && export GEM_HOME=/.gems \ && export GEM_PATH=/.gems \ - && gem install --no-document fpm \ + && gem install ffi:1.12.2 --no-document fpm \ && /usr/local/rvm/bin/rvm repair wrappers RUN echo 'source /etc/profile.d/rvm.sh' >> .bashrc diff --git a/builder/Dockerfile.centos-7 b/builder/Dockerfile.centos-7 index 914283f..4ddc1ff 100644 --- a/builder/Dockerfile.centos-7 +++ b/builder/Dockerfile.centos-7 @@ -53,7 +53,7 @@ RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && \ RUN pip install awscli --upgrade --user && \ ln -s /root/.local/bin/aws /usr/bin/aws -RUN gem install fpm +RUN gem install ffi:1.12.2 fpm RUN chmod 0777 /opt diff --git a/builder/Dockerfile.opensuse-42 b/builder/Dockerfile.opensuse-42 index 5f0c77b..95a4150 100644 --- a/builder/Dockerfile.opensuse-42 +++ b/builder/Dockerfile.opensuse-42 @@ -66,7 +66,7 @@ RUN zypper --non-interactive --gpg-auto-import-keys -n install \ RUN pip install awscli -RUN gem install fpm && ln -s /usr/lib64/ruby/gems/2.1.0/gems/fpm-1.11.0/bin/fpm /bin/fpm +RUN gem install ffi:1.12.2 fpm && ln -s /usr/lib64/ruby/gems/2.1.0/gems/fpm-1.11.0/bin/fpm /bin/fpm RUN chmod 0777 /opt