From fc32f1815a5a80b4f6d41d289da21ece9829386e Mon Sep 17 00:00:00 2001 From: "Joshua C. Forest" Date: Fri, 4 Feb 2022 08:23:41 -0500 Subject: [PATCH] PR feedback --- builder/Dockerfile.ubuntu-2204 | 5 ++--- handler.py | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/builder/Dockerfile.ubuntu-2204 b/builder/Dockerfile.ubuntu-2204 index 6595b29..55650c1 100644 --- a/builder/Dockerfile.ubuntu-2204 +++ b/builder/Dockerfile.ubuntu-2204 @@ -11,14 +11,13 @@ RUN set -x \ RUN pip3 install awscli -# Pin fpm to avoid git dependency in 1.12.0 -RUN gem install fpm:1.11.0 +RUN gem install fpm RUN chmod 0777 /opt # Override the default pager used by R ENV PAGER /usr/bin/pager -COPY package.ubuntu-2004 /package.sh +COPY package.ubuntu-2204 /package.sh COPY build.sh . ENTRYPOINT ./build.sh diff --git a/handler.py b/handler.py index 1973986..a35003d 100644 --- a/handler.py +++ b/handler.py @@ -129,6 +129,7 @@ def queue_builds(event, context): # zlib version fails to handle versions longer than 5 characters. # Skip builds affected by this bug. if platform in [ + 'ubuntu-2204', 'ubuntu-2004', 'ubuntu-1804', 'opensuse-15',