Merge pull request #112 from rstudio/glin/c8-rocky

Use Rocky Linux 8 in place of CentOS 8; platform updates
2022-02-10 11:35:03 -06:00 · 2022-02-10 11:35:03 -06:00 · 5904663b70
commit 5904663b70
parent fa8f303cf7 c87a7a623e
11 changed files with 22 additions and 328 deletions
--- a/4
+++ b/4
@ -1,4 +1,4 @@
-PLATFORMS := ubuntu-1604 ubuntu-1804 ubuntu-2004 ubuntu-2204 debian-9 debian-10 centos-7 centos-8 opensuse-42 opensuse-15 opensuse-152 opensuse-153
+PLATFORMS := ubuntu-1804 ubuntu-2004 ubuntu-2204 debian-9 debian-10 centos-7 centos-8 opensuse-42 opensuse-152 opensuse-153
 SLS_BINARY ?= ./node_modules/serverless/bin/serverless

 deps:
@ -22,7 +22,7 @@ docker-build-r: docker-build
 	@cd builder && docker-compose up

 docker-shell-r-env:
-	@cd builder && docker-compose run --entrypoint /bin/bash ubuntu-1604
+	@cd builder && docker-compose run --entrypoint /bin/bash ubuntu-2004

 ecr-login:
 	(aws ecr get-login-password --region us-east-1 | docker login --username AWS --password-stdin $(AWS_ACCOUNT_ID).dkr.ecr.$(AWS_REGION).amazonaws.com)
--- a/README.md
+++ b/README.md
@ -18,11 +18,12 @@ 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, 20.04
+- Ubuntu 18.04, 20.04, 22.04
 - Debian 9, 10
- CentOS / Red Hat Enterprise Linux 7, 8
- openSUSE 42.3, 15.1, 15.2, 15.3
- SUSE Linux Enterprise 12, 15 SP1, 15 SP2, 15 SP3
+- CentOS 7
+- Red Hat Enterprise Linux 7, 8
+- openSUSE 42.3, 15.2, 15.3
+- SUSE Linux Enterprise 12, 15 SP2, 15 SP3

 ## Quick Installation

@ -49,15 +50,15 @@ R_VERSION=3.5.3

 Download the deb package:
 ```bash
-# Ubuntu 16.04
-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

+# Ubuntu 22.04
+wget https://cdn.rstudio.com/r/ubuntu-2204/pkgs/r-${R_VERSION}_1_amd64.deb
+
 # Debian 9
 wget https://cdn.rstudio.com/r/debian-9/pkgs/r-${R_VERSION}_1_amd64.deb

@ -96,7 +97,7 @@ Download the rpm package:
 # CentOS / RHEL 7
 wget https://cdn.rstudio.com/r/centos-7/pkgs/R-${R_VERSION}-1-1.x86_64.rpm

-# CentOS / RHEL 8
+# RHEL 8
 wget https://cdn.rstudio.com/r/centos-8/pkgs/R-${R_VERSION}-1-1.x86_64.rpm
 ```

@ -119,9 +120,6 @@ Download the rpm package:
 # openSUSE 42.3 / SLES 12
 wget https://cdn.rstudio.com/r/opensuse-42/pkgs/R-${R_VERSION}-1-1.x86_64.rpm

-# openSUSE 15.1 / SLES 15 SP1
-wget https://cdn.rstudio.com/r/opensuse-15/pkgs/R-${R_VERSION}-1-1.x86_64.rpm
-
 # openSUSE 15.2 / SLES 15 SP2
 wget https://cdn.rstudio.com/r/opensuse-152/pkgs/R-${R_VERSION}-1-1.x86_64.rpm

@ -173,7 +171,7 @@ new platform or inspect an existing platform.

 ### Dockerfile

-Create a `builder/Dockerfile.platform-version` (where `platform-version` is `ubuntu-1604` or `centos-7`, etc.) This file must contain four major tasks:
+Create a `builder/Dockerfile.platform-version` (where `platform-version` is `ubuntu-2204` or `centos-7`, etc.) This file must contain four major tasks:

 1. an `OS_IDENTIFIER` env with the `platform-version`.
 2. a step which ensures the R source build dependencies are installed
@ -228,7 +226,7 @@ environment:
  # snip
  JOB_DEFINITION_ARN_debian_9:
    Ref: rBuildsBatchJobDefinitionDebian9
-  SUPPORTED_PLATFORMS: ubuntu-1604,ubuntu-1804,debian-9,debian-10,centos-7,centos-8,opensuse-42,opensuse-15
+  SUPPORTED_PLATFORMS: ubuntu-1804,debian-9,debian-10,centos-7,centos-8,opensuse-42
 ```

 ### Makefile
--- a/builder/Dockerfile.centos-8
+++ b/builder/Dockerfile.centos-8
@ -1,4 +1,4 @@
-FROM centos:centos8
+FROM rockylinux:8

 ENV OS_IDENTIFIER centos-8

--- a/builder/Dockerfile.opensuse-15
+++ b/builder/Dockerfile.opensuse-15
@ -1,88 +0,0 @@
-FROM opensuse/leap:15.0
-
-ENV OS_IDENTIFIER opensuse-15
-
-# Most of these packages, and also the configure options that follow were determined
-# by reviewing "R-base.spec" from the following OpenSUSE RPM:
-# https://download.opensuse.org/repositories/devel:/languages:/R:/released/openSUSE_Leap_42.3/src/R-base-3.5.3-103.1.src.rpm
-
-RUN zypper --non-interactive update
-RUN zypper --non-interactive --gpg-auto-import-keys -n install \
-    bzip2 \
-    cairo-devel \
-    fdupes \
-    gcc \
-    gcc-c++ \
-    gcc-fortran \
-    glib2-devel \
-    glibc-locale \
-    help2man \
-    java-1_8_0-openjdk-devel \
-    libX11-devel \
-    libXScrnSaver-devel \
-    libXmu-devel \
-    libXt-devel \
-    libbz2-devel \
-    libcurl-devel \
-    libicu-devel \
-    libjpeg-devel \
-    libpng-devel \
-    libtiff-devel \
-    make \
-    pango-devel \
-    pcre-devel \
-    pcre2-devel \
-    perl \
-    perl-macros \
-    python \
-    python-pip \
-    readline-devel \
-    rpm-build \
-    ruby \
-    ruby-devel \
-    shadow \
-    tcl-devel \
-    texinfo \
-    texlive-ae \
-    texlive-bibtex \
-    texlive-cm-super \
-    texlive-dvips \
-    texlive-fancyvrb \
-    texlive-helvetic \
-    texlive-inconsolata \
-    texlive-latex \
-    texlive-makeindex \
-    texlive-metafont \
-    texlive-psnfss \
-    texlive-tex \
-    texlive-times \
-    tk-devel \
-    unzip \
-    wget \
-    xdg-utils \
-    xorg-x11-devel \
-    xz-devel \
-    zip \
-    zlib-devel \
-    && zypper clean
-
-RUN pip install awscli
-
-# 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
-
-# Configure flags for SUSE that don't use the defaults in build.sh
-ENV CONFIGURE_OPTIONS="\
-    --enable-R-shlib \
-    --with-tcltk \
-    --with-x \
-    --enable-memory-profiling \
-    --with-tcl-config=/usr/lib64/tclConfig.sh \
-    --with-tk-config=/usr/lib64/tkConfig.sh"
-
-COPY package.opensuse-15 /package.sh
-COPY build.sh .
-ENTRYPOINT ./build.sh
--- a/builder/Dockerfile.ubuntu-1604
+++ b/builder/Dockerfile.ubuntu-1604
@ -1,27 +0,0 @@
-FROM ubuntu:xenial
-
-ENV OS_IDENTIFIER ubuntu-1604
-
-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 curl libcurl4-openssl-dev libicu-dev libopenblas-base libpcre2-dev wget ruby ruby-dev \
-  && apt-get build-dep -y r-base
-
-RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" && \
-    unzip awscliv2.zip && \
-    ./aws/install && \
-    rm -rf aws awscliv2.zip
-
-# Pin fpm to avoid git dependency in 1.12.0
-RUN gem install fpm:1.11.0
-
-RUN chmod 0777 /opt
-
-# Override the default pager used by R
-ENV PAGER /usr/bin/pager
-
-COPY package.ubuntu-1604 /package.sh
-COPY build.sh .
-ENTRYPOINT ./build.sh
--- a/builder/docker-compose.yml
+++ b/builder/docker-compose.yml
@ -1,17 +1,6 @@
 version: '2.0'

 services:
-  ubuntu-1604:
-    command: ./build.sh
-    environment:
-      - R_VERSION=${R_VERSION}
-      - LOCAL_STORE=/tmp/output
-    build:
-      context: .
-      dockerfile: Dockerfile.ubuntu-1604
-    image: r-builds:ubuntu-1604
-    volumes:
-      - ./integration/tmp:/tmp/output
  ubuntu-1804:
    command: ./build.sh
    environment:
@ -78,17 +67,17 @@ services:
    image: r-builds:centos-7
    volumes:
      - ./integration/tmp:/tmp/output
-  # centos-8:
-  #   command: ./build.sh
-  #   environment:
-  #     - R_VERSION=${R_VERSION}
-  #     - LOCAL_STORE=/tmp/output
-  #   build:
-  #     context: .
-  #     dockerfile: Dockerfile.centos-8
-  #   image: r-builds:centos-8
-  #   volumes:
-  #     - ./integration/tmp:/tmp/output
+  centos-8:
+    command: ./build.sh
+    environment:
+      - R_VERSION=${R_VERSION}
+      - LOCAL_STORE=/tmp/output
+    build:
+      context: .
+      dockerfile: Dockerfile.centos-8
+    image: r-builds:centos-8
+    volumes:
+      - ./integration/tmp:/tmp/output
  opensuse-42:
    command: ./build.sh
    environment:
@ -100,17 +89,6 @@ services:
    image: r-builds:opensuse-42
    volumes:
      - ./integration/tmp:/tmp/output
-  opensuse-15:
-    command: ./build.sh
-    environment:
-      - R_VERSION=${R_VERSION}
-      - LOCAL_STORE=/tmp/output
-    build:
-      context: .
-      dockerfile: Dockerfile.opensuse-15
-    image: r-builds:opensuse-15
-    volumes:
-      - ./integration/tmp:/tmp/output
  opensuse-152:
    command: ./build.sh
    environment:
--- a/builder/package.opensuse-15
+++ b/builder/package.opensuse-15
@ -1,75 +0,0 @@
-#!/bin/bash
-
-if [[ ! -d /tmp/output/opensuse-15 ]]; then
-  mkdir -p /tmp/output/opensuse-15
-fi
-
-# R 3.x requires PCRE1
-pcre_lib='pcre2-devel'
-if [[ "${R_VERSION}" =~ ^3 ]]; then
-  pcre_lib='pcre-devel'
-fi
-
-# create post-install script required for openblas
-cat <<EOF >> /post-install.sh
-mv /opt/R/${R_VERSION}/lib/R/lib/libRblas.so /opt/R/${R_VERSION}/lib/R/lib/libRblas.so.keep
-ln -s /usr/lib64/libopenblas.so /opt/R/${R_VERSION}/lib/R/lib/libRblas.so
-EOF
-
-# create after-remove script to remove internal blas
-cat <<EOF >> /before-remove.sh
-if [ -d /opt/R/${R_VERSION} ]; then
-  rm -r /opt/R/${R_VERSION}
-fi
-EOF
-
-fpm \
-  -s dir \
-  -t rpm \
-  -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" \
-  --after-install /post-install.sh \
-  --after-remove /before-remove.sh \
-  -p /tmp/output/opensuse-15/ \
-  -d fontconfig \
-  -d gcc \
-  -d gcc-c++ \
-  -d gcc-fortran \
-  -d glibc-locale \
-  -d gzip \
-  -d libbz2-devel \
-  -d libcairo2 \
-  -d libcurl-devel \
-  -d libfreetype6 \
-  -d libgomp1 \
-  -d libicu-devel \
-  -d libjpeg62 \
-  -d libpango-1_0-0 \
-  -d libreadline7 \
-  -d libtiff5 \
-  -d make \
-  -d openblas-devel \
-  -d ${pcre_lib} \
-  -d tar \
-  -d tcl \
-  -d tk \
-  -d unzip \
-  -d which \
-  -d xorg-x11 \
-  -d xorg-x11-fonts-100dpi \
-  -d xorg-x11-fonts-75dpi \
-  -d xz-devel \
-  -d zip \
-  -d zlib-devel \
-  /opt/R/${R_VERSION}
-
-shopt -s extglob
-export PKG_FILE=$(ls /tmp/output/opensuse-15/[rR]-${R_VERSION}*.@(deb|rpm) | head -1)
-
--- a/builder/package.ubuntu-1604
+++ b/builder/package.ubuntu-1604
@ -1,59 +0,0 @@
-#!/bin/bash
-
-if [[ ! -d /tmp/output/ubuntu-1604 ]]; then
-  mkdir -p /tmp/output/ubuntu-1604
-fi
-
-# R 3.x requires PCRE1
-pcre_lib='libpcre2-dev'
-if [[ "${R_VERSION}" =~ ^3 ]]; then
-  pcre_lib='libpcre3-dev'
-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-1604/ \
-  -d g++ \
-  -d gcc \
-  -d gfortran \
-  -d libbz2-dev \
-  -d libc6 \
-  -d libcairo2 \
-  -d libcurl3 \
-  -d libglib2.0-0 \
-  -d libgomp1 \
-  -d libicu-dev \
-  -d libjpeg8 \
-  -d liblzma-dev \
-  -d libopenblas-dev \
-  -d libpango-1.0-0 \
-  -d libpangocairo-1.0-0 \
-  -d libpaper-utils \
-  -d ${pcre_lib} \
-  -d libpng16-16 \
-  -d libreadline6 \
-  -d libtcl8.6 \
-  -d libtiff5 \
-  -d libtk8.6 \
-  -d libx11-6 \
-  -d libxt6 \
-  -d make \
-  -d ucf \
-  -d unzip \
-  -d zip \
-  -d zlib1g-dev \
-  /opt/R/${R_VERSION}
-
-shopt -s extglob
-export PKG_FILE=$(ls /tmp/output/ubuntu-1604/[rR]-${R_VERSION}*.@(deb|rpm) | head -1)
-
--- a/handler.py
+++ b/handler.py
@ -121,7 +121,7 @@ def _check_for_job_status(jobs, status):
 def queue_builds(event, context):
    """Queue some builds."""
    event['versions_to_build'] =  _versions_to_build(event.get('force', False), event.get('versions'))
-    event['supported_platforms'] = _to_list(os.environ.get('SUPPORTED_PLATFORMS', 'ubuntu-1604'))
+    event['supported_platforms'] = _to_list(os.environ.get('SUPPORTED_PLATFORMS', 'ubuntu-2004'))
    job_ids = []
    for version in event['versions_to_build']:
        for platform in event['supported_platforms']:
@ -132,7 +132,6 @@ def queue_builds(event, context):
                'ubuntu-2204',
                'ubuntu-2004',
                'ubuntu-1804',
-                'opensuse-15',
                'opensuse-152',
                'opensuse-153',
                'centos-8',
--- a/serverless-resources.yml
+++ b/serverless-resources.yml
@ -131,20 +131,6 @@ rBuildsBatchJobQueue:
    State: ENABLED
    Priority: 1

-rBuildsBatchJobDefinitionUbuntu1604:
-  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-1604"
-    Timeout:
-      AttemptDurationSeconds: 7200
 rBuildsBatchJobDefinitionUbuntu1804:
  Type: AWS::Batch::JobDefinition
  Properties:
@ -257,20 +243,6 @@ rBuildsBatchJobDefinitionOpensuse42:
      Image: "#{AWS::AccountId}.dkr.ecr.#{AWS::Region}.amazonaws.com/r-builds:opensuse-42"
    Timeout:
      AttemptDurationSeconds: 7200
-rBuildsBatchJobDefinitionOpensuse15:
-  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:opensuse-15"
-    Timeout:
-      AttemptDurationSeconds: 7200
 rBuildsBatchJobDefinitionOpensuse152:
  Type: AWS::Batch::JobDefinition
  Properties:
--- a/serverless.yml
+++ b/serverless.yml
@ -35,8 +35,6 @@ provider:
    S3_BUCKET: ${self:custom.${self:provider.stage}.s3Bucket}
    JOB_QUEUE_ARN:
      Ref: rBuildsBatchJobQueue
-    JOB_DEFINITION_ARN_ubuntu_1604:
-      Ref: rBuildsBatchJobDefinitionUbuntu1604
    JOB_DEFINITION_ARN_ubuntu_1804:
      Ref: rBuildsBatchJobDefinitionUbuntu1804
    JOB_DEFINITION_ARN_ubuntu_2004:
@ -53,13 +51,11 @@ provider:
      Ref: rBuildsBatchJobDefinitionCentos8
    JOB_DEFINITION_ARN_opensuse_42:
      Ref: rBuildsBatchJobDefinitionOpensuse42
-    JOB_DEFINITION_ARN_opensuse_15:
-      Ref: rBuildsBatchJobDefinitionOpensuse15
    JOB_DEFINITION_ARN_opensuse_152:
      Ref: rBuildsBatchJobDefinitionOpensuse152
    JOB_DEFINITION_ARN_opensuse_153:
      Ref: rBuildsBatchJobDefinitionOpensuse153
-    SUPPORTED_PLATFORMS: ubuntu-1604,ubuntu-1804,ubuntu-2004,ubuntu-2204,debian-9,debian-10,centos-7,centos-8,opensuse-42,opensuse-15,opensuse-152,opensuse-153
+    SUPPORTED_PLATFORMS: ubuntu-1804,ubuntu-2004,ubuntu-2204,debian-9,debian-10,centos-7,centos-8,opensuse-42,opensuse-152,opensuse-153

 functions:
  queueBuilds: