From 6098b0074f35a54265ae5eda94411d47d6601f16 Mon Sep 17 00:00:00 2001 From: Greg Lin Date: Tue, 16 Feb 2021 10:51:15 -0600 Subject: [PATCH] Pin fpm to 1.11.0 fpm 1.12.0 adds an unintended runtime dependency on git, which should be fixed in a future release. Pin fpm for now since installing git has its own side effects, such as installing less and changing the default pager on systems where less isn't available by default. --- builder/Dockerfile.centos-8 | 3 ++- builder/Dockerfile.debian-10 | 3 ++- builder/Dockerfile.debian-9 | 3 ++- builder/Dockerfile.opensuse-15 | 3 ++- builder/Dockerfile.opensuse-152 | 3 ++- builder/Dockerfile.ubuntu-1604 | 3 ++- builder/Dockerfile.ubuntu-1804 | 3 ++- builder/Dockerfile.ubuntu-2004 | 3 ++- 8 files changed, 16 insertions(+), 8 deletions(-) diff --git a/builder/Dockerfile.centos-8 b/builder/Dockerfile.centos-8 index 24aa558..b506fa3 100644 --- a/builder/Dockerfile.centos-8 +++ b/builder/Dockerfile.centos-8 @@ -52,7 +52,8 @@ RUN dnf -y upgrade \ RUN pip3 install awscli --upgrade --user \ && ln -s /root/.local/bin/aws /usr/bin/aws -RUN gem install fpm +# Pin fpm to avoid git dependency in 1.12.0 +RUN gem install fpm:1.11.0 RUN chmod 0777 /opt diff --git a/builder/Dockerfile.debian-10 b/builder/Dockerfile.debian-10 index 077c7b4..ea20ef3 100644 --- a/builder/Dockerfile.debian-10 +++ b/builder/Dockerfile.debian-10 @@ -14,7 +14,8 @@ RUN pip3 install awscli RUN chmod 0777 /opt -RUN gem install fpm +# Pin fpm to avoid git dependency in 1.12.0 +RUN gem install fpm:1.11.0 # Override the default pager used by R ENV PAGER /usr/bin/pager diff --git a/builder/Dockerfile.debian-9 b/builder/Dockerfile.debian-9 index d7ef735..4325a67 100644 --- a/builder/Dockerfile.debian-9 +++ b/builder/Dockerfile.debian-9 @@ -14,7 +14,8 @@ RUN pip install awscli RUN chmod 0777 /opt -RUN gem install fpm +# Pin fpm to avoid git dependency in 1.12.0 +RUN gem install fpm:1.11.0 # Override the default pager used by R ENV PAGER /usr/bin/pager diff --git a/builder/Dockerfile.opensuse-15 b/builder/Dockerfile.opensuse-15 index 037760c..e2f6ea2 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 && \ +# Pin fpm to avoid git dependency in 1.12.0 +RUN gem install fpm:1.11.0 && \ 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 bfd91af..66c94ed 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 && \ +# Pin fpm to avoid git dependency in 1.12.0 +RUN gem install fpm:1.11.0 && \ ln -s /usr/bin/fpm.ruby2.5 /usr/local/bin/fpm RUN chmod 0777 /opt diff --git a/builder/Dockerfile.ubuntu-1604 b/builder/Dockerfile.ubuntu-1604 index ceec947..92dd65e 100644 --- a/builder/Dockerfile.ubuntu-1604 +++ b/builder/Dockerfile.ubuntu-1604 @@ -11,7 +11,8 @@ RUN set -x \ RUN pip install awscli -RUN gem install fpm +# Pin fpm to avoid git dependency in 1.12.0 +RUN gem install fpm:1.11.0 RUN chmod 0777 /opt diff --git a/builder/Dockerfile.ubuntu-1804 b/builder/Dockerfile.ubuntu-1804 index 6824c0b..a2331d4 100644 --- a/builder/Dockerfile.ubuntu-1804 +++ b/builder/Dockerfile.ubuntu-1804 @@ -11,7 +11,8 @@ RUN set -x \ RUN pip install awscli -RUN gem install fpm +# Pin fpm to avoid git dependency in 1.12.0 +RUN gem install fpm:1.11.0 RUN chmod 0777 /opt diff --git a/builder/Dockerfile.ubuntu-2004 b/builder/Dockerfile.ubuntu-2004 index 774222a..fa70db0 100644 --- a/builder/Dockerfile.ubuntu-2004 +++ b/builder/Dockerfile.ubuntu-2004 @@ -11,7 +11,8 @@ RUN set -x \ RUN pip3 install awscli -RUN gem install fpm +# Pin fpm to avoid git dependency in 1.12.0 +RUN gem install fpm:1.11.0 RUN chmod 0777 /opt