devxy/r-builds
Watch
2
0
Fork
You've already forked r-builds
 0
Code Issues 1 Pull requests Releases Activity

Fix installations of fpm 1.12.0

Browse source 
* Pin fpm on older distros for compatibility with Ruby < 2.3
* Fix hardcoded references to fpm 1.11.0
This commit is contained in:
Greg Lin 2021-01-26 11:39:01 -06:00
commit 3de0397cee
4 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
builder/Dockerfile.centos-7
View file

@ -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

3
builder/Dockerfile.opensuse-15
View file

@ -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

3
builder/Dockerfile.opensuse-152
View file

@ -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

4
builder/Dockerfile.opensuse-42
View file

@ -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