From 3de0397ceeab6ff768313a366a4c3ec97785cfac Mon Sep 17 00:00:00 2001 From: Greg Lin Date: Tue, 26 Jan 2021 11:39:01 -0600 Subject: [PATCH] Fix installations of fpm 1.12.0 * Pin fpm on older distros for compatibility with Ruby < 2.3 * Fix hardcoded references to fpm 1.11.0 --- builder/Dockerfile.centos-7 | 3 ++- builder/Dockerfile.opensuse-15 | 3 ++- builder/Dockerfile.opensuse-152 | 3 ++- builder/Dockerfile.opensuse-42 | 4 +++- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/builder/Dockerfile.centos-7 b/builder/Dockerfile.centos-7 index 9114277..2344c56 100644 --- a/builder/Dockerfile.centos-7 +++ b/builder/Dockerfile.centos-7 @@ -51,7 +51,8 @@ RUN yum -y update \ RUN pip3 install awscli --upgrade --user && \ ln -s /root/.local/bin/aws /usr/bin/aws -RUN gem install ffi:1.12.2 fpm +# Pin fpm for compatibility with Ruby < 2.3 +RUN gem install ffi:1.12.2 fpm:1.11.0 RUN chmod 0777 /opt diff --git a/builder/Dockerfile.opensuse-15 b/builder/Dockerfile.opensuse-15 index b0bccd0..037760c 100644 --- a/builder/Dockerfile.opensuse-15 +++ b/builder/Dockerfile.opensuse-15 @@ -66,7 +66,8 @@ 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.5.0/gems/fpm-1.11.0/bin/fpm /bin/fpm +RUN gem install fpm && \ + ln -s /usr/bin/fpm.ruby2.5 /usr/local/bin/fpm RUN chmod 0777 /opt diff --git a/builder/Dockerfile.opensuse-152 b/builder/Dockerfile.opensuse-152 index a9fa0a9..bfd91af 100644 --- a/builder/Dockerfile.opensuse-152 +++ b/builder/Dockerfile.opensuse-152 @@ -66,7 +66,8 @@ 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.5.0/gems/fpm-1.11.0/bin/fpm /bin/fpm +RUN gem install fpm && \ + ln -s /usr/bin/fpm.ruby2.5 /usr/local/bin/fpm RUN chmod 0777 /opt diff --git a/builder/Dockerfile.opensuse-42 b/builder/Dockerfile.opensuse-42 index 95a4150..f7f9435 100644 --- a/builder/Dockerfile.opensuse-42 +++ b/builder/Dockerfile.opensuse-42 @@ -66,7 +66,9 @@ RUN zypper --non-interactive --gpg-auto-import-keys -n install \ RUN pip install awscli -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 +# Pin fpm for compatibility with Ruby < 2.3 +RUN gem install ffi:1.12.2 fpm:1.11.0 && \ + ln -s /usr/bin/fpm.ruby2.1 /usr/local/bin/fpm RUN chmod 0777 /opt