Merge pull request #52 from rstudio/jc-ubuntu-20

Add Ubuntu 20.04 LTS support

Makefile

@@ -1,4 +1,4 @@
-PLATFORMS := ubuntu-1604 ubuntu-1804 debian-9 centos-6 centos-7 centos-8 opensuse-42 opensuse-15
+PLATFORMS := ubuntu-1604 ubuntu-1804 ubuntu-2004 debian-9 centos-6 centos-7 centos-8 opensuse-42 opensuse-15
 SLS_BINARY ?= ./node_modules/serverless/bin/serverless
 
 deps:

README.md

@@ -18,7 +18,7 @@ bug, or ask questions on [RStudio Community](https://community.rstudio.com).
 ## Supported Platforms
 
 R binaries are built for the following Linux operating systems:
-- Ubuntu 16.04, 18.04
+- Ubuntu 16.04, 18.04, 20.04
 - Debian 9
 - CentOS / Red Hat Enterprise Linux 6, 7, 8
 - openSUSE 42.3, 15.0
@@ -55,6 +55,9 @@ wget https://cdn.rstudio.com/r/ubuntu-1604/pkgs/r-${R_VERSION}_1_amd64.deb
 # Ubuntu 18.04
 wget https://cdn.rstudio.com/r/ubuntu-1804/pkgs/r-${R_VERSION}_1_amd64.deb
 
+# Ubuntu 20.04
+wget https://cdn.rstudio.com/r/ubuntu-2004/pkgs/r-${R_VERSION}_1_amd64.deb
+
 # Debian 9
 wget https://cdn.rstudio.com/r/debian-9/pkgs/r-${R_VERSION}_1_amd64.deb
 ```

builder/Dockerfile.ubuntu-2004

@@ -0,0 +1,23 @@
+FROM ubuntu:focal
+
+ENV OS_IDENTIFIER ubuntu-2004
+
+RUN set -x \
+  && sed -i "s|# deb-src|deb-src|g" /etc/apt/sources.list \
+  && export DEBIAN_FRONTEND=noninteractive \
+  && apt-get update \
+  && apt-get install -y libcurl4-openssl-dev libicu-dev libopenblas-base libpcre2-dev wget python3-pip ruby ruby-dev \
+  && apt-get build-dep -y r-base
+
+RUN pip3 install awscli
+
+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 build.sh .
+ENTRYPOINT ./build.sh

builder/docker-compose.yml

@@ -23,6 +23,17 @@ services:
     image: r-builds:ubuntu-1804
     volumes:
       - ./integration/tmp:/tmp/output
+  ubuntu-2004:
+    command: ./build.sh
+    environment:
+      - R_VERSION=${R_VERSION}
+      - LOCAL_STORE=/tmp/output
+    build:
+      context: .
+      dockerfile: Dockerfile.ubuntu-2004
+    image: r-builds:ubuntu-2004
+    volumes:
+      - ./integration/tmp:/tmp/output
   debian-9:
     command: ./build.sh
     environment:

builder/package.ubuntu-2004

@@ -0,0 +1,54 @@
+#!/bin/bash
+
+if [[ ! -d /tmp/output/ubuntu-2004 ]]; then
+  mkdir -p /tmp/output/ubuntu-2004
+fi
+
+fpm \
+  -s dir \
+  -t deb \
+  -v 1 \
+  -n R-${R_VERSION} \
+  --vendor "RStudio, PBC" \
+  --deb-priority "optional" \
+  --deb-field 'Bugs: https://github.com/rstudio/r-builds/issues' \
+  --url "http://www.r-project.org/" \
+  --description "GNU R statistical computation and graphics system" \
+  --maintainer "RStudio, PBC https://github.com/rstudio/r-builds" \
+  --license "GPL-2" \
+  -p /tmp/output/ubuntu-2004/ \
+  -d g++ \
+  -d gcc \
+  -d gfortran \
+  -d libbz2-1.0 \
+  -d libc6 \
+  -d libcairo2 \
+  -d libcurl4 \
+  -d libglib2.0-0 \
+  -d libgomp1 \
+  -d libicu66 \
+  -d libjpeg8 \
+  -d liblzma5 \
+  -d libopenblas-dev \
+  -d libpango-1.0-0 \
+  -d libpangocairo-1.0-0 \
+  -d libpaper-utils \
+  -d libpcre2-8-0 \
+  -d libpcre3 \
+  -d libpng16-16 \
+  -d libreadline8 \
+  -d libtcl8.6 \
+  -d libtiff5 \
+  -d libtk8.6 \
+  -d libx11-6 \
+  -d libxt6 \
+  -d make \
+  -d ucf \
+  -d unzip \
+  -d zip \
+  -d zlib1g \
+  /opt/R/${R_VERSION}
+
+shopt -s extglob
+export PKG_FILE=$(ls /tmp/output/ubuntu-2004/[rR]-${R_VERSION}*.@(deb|rpm) | head -1)
+

handler.py

@@ -125,7 +125,7 @@ def queue_builds(event, context):
             # In R 3.3.0, 3.3.1, and 3.3.2, the configure script check for the
             # zlib version fails to handle versions longer than 5 characters.
             # Skip builds affected by this bug.
-            if platform in ['ubuntu-1804', 'opensuse-15', 'centos-8'] and version in ['3.3.0', '3.3.1', '3.3.2']:
+            if platform in ['ubuntu-2004', 'ubuntu-1804', 'opensuse-15', 'centos-8'] and version in ['3.3.0', '3.3.1', '3.3.2']:
                 continue
             job_ids.append(_submit_job(version, platform))
     event['jobIds'] = job_ids

serverless-resources.yml

@@ -155,6 +155,18 @@ rBuildsBatchJobDefinitionUbuntu1804:
       JobRoleArn:
         "Fn::GetAtt": [ rBuildsEcsTaskIamRole, Arn ]
       Image: "#{AWS::AccountId}.dkr.ecr.#{AWS::Region}.amazonaws.com/r-builds:ubuntu-1804"
+rBuildsBatchJobDefinitionUbuntu2004:
+  Type: AWS::Batch::JobDefinition
+  Properties:
+    Type: container
+    ContainerProperties:
+      Command:
+        - ./build.sh
+      Vcpus: 4
+      Memory: 4096
+      JobRoleArn:
+        "Fn::GetAtt": [ rBuildsEcsTaskIamRole, Arn ]
+      Image: "#{AWS::AccountId}.dkr.ecr.#{AWS::Region}.amazonaws.com/r-builds:ubuntu-2004"
 rBuildsBatchJobDefinitionDebian9:
   Type: AWS::Batch::JobDefinition
   Properties:

serverless.yml

@@ -39,6 +39,8 @@ provider:
       Ref: rBuildsBatchJobDefinitionUbuntu1604
     JOB_DEFINITION_ARN_ubuntu_1804:
       Ref: rBuildsBatchJobDefinitionUbuntu1804
+    JOB_DEFINITION_ARN_ubuntu_2004:
+      Ref: rBuildsBatchJobDefinitionUbuntu2004
     JOB_DEFINITION_ARN_debian_9:
       Ref: rBuildsBatchJobDefinitionDebian9
     JOB_DEFINITION_ARN_centos_6:
@@ -51,7 +53,7 @@ provider:
       Ref: rBuildsBatchJobDefinitionOpensuse42
     JOB_DEFINITION_ARN_opensuse_15:
       Ref: rBuildsBatchJobDefinitionOpensuse15
-    SUPPORTED_PLATFORMS: ubuntu-1604,ubuntu-1804,debian-9,centos-6,centos-7,centos-8,opensuse-42,opensuse-15
+    SUPPORTED_PLATFORMS: ubuntu-1604,ubuntu-1804,ubuntu-2004,debian-9,centos-6,centos-7,centos-8,opensuse-42,opensuse-15
 
 functions:
   queueBuilds: