diff --git a/Makefile b/Makefile index 716919d..51fbf5b 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -PLATFORMS := ubuntu-1804 ubuntu-2004 ubuntu-2204 debian-9 debian-10 debian-11 centos-7 centos-8 opensuse-42 opensuse-152 opensuse-153 +PLATFORMS := ubuntu-1804 ubuntu-2004 ubuntu-2204 debian-9 debian-10 debian-11 centos-7 centos-8 opensuse-42 opensuse-153 SLS_BINARY ?= ./node_modules/serverless/bin/serverless deps: diff --git a/README.md b/README.md index b20597b..d6455b5 100644 --- a/README.md +++ b/README.md @@ -19,11 +19,11 @@ bug, or ask questions on [RStudio Community](https://community.rstudio.com). R binaries are built for the following Linux operating systems: - Ubuntu 18.04, 20.04, 22.04 -- Debian 9, 10 +- Debian 9, 10, 11 - CentOS 7 - Red Hat Enterprise Linux 7, 8 -- openSUSE 42.3, 15.2, 15.3 -- SUSE Linux Enterprise 12, 15 SP2, 15 SP3 +- openSUSE 42.3, 15.3 +- SUSE Linux Enterprise 12, 15 SP3 ## Quick Installation @@ -123,9 +123,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.2 / SLES 15 SP2 -wget https://cdn.rstudio.com/r/opensuse-152/pkgs/R-${R_VERSION}-1-1.x86_64.rpm - # openSUSE 15.3 / SLES 15 SP3 wget https://cdn.rstudio.com/r/opensuse-153/pkgs/R-${R_VERSION}-1-1.x86_64.rpm ``` diff --git a/builder/Dockerfile.opensuse-152 b/builder/Dockerfile.opensuse-152 deleted file mode 100644 index 6990536..0000000 --- a/builder/Dockerfile.opensuse-152 +++ /dev/null @@ -1,88 +0,0 @@ -FROM opensuse/leap:15.2 - -ENV OS_IDENTIFIER opensuse-152 - -# 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-152 /package.sh -COPY build.sh . -ENTRYPOINT ./build.sh diff --git a/builder/docker-compose.yml b/builder/docker-compose.yml index c1335ef..722df60 100644 --- a/builder/docker-compose.yml +++ b/builder/docker-compose.yml @@ -100,17 +100,6 @@ services: image: r-builds:opensuse-42 volumes: - ./integration/tmp:/tmp/output - opensuse-152: - command: ./build.sh - environment: - - R_VERSION=${R_VERSION} - - LOCAL_STORE=/tmp/output - build: - context: . - dockerfile: Dockerfile.opensuse-152 - image: r-builds:opensuse-152 - volumes: - - ./integration/tmp:/tmp/output opensuse-153: command: ./build.sh environment: diff --git a/builder/package.opensuse-152 b/builder/package.opensuse-152 deleted file mode 100644 index 933e600..0000000 --- a/builder/package.opensuse-152 +++ /dev/null @@ -1,75 +0,0 @@ -#!/bin/bash - -if [[ ! -d /tmp/output/opensuse-152 ]]; then - mkdir -p /tmp/output/opensuse-152 -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 <> /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 <> /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-152/ \ - -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-152/[rR]-${R_VERSION}*.@(deb|rpm) | head -1) - diff --git a/handler.py b/handler.py index 56969cc..debba6a 100644 --- a/handler.py +++ b/handler.py @@ -132,7 +132,6 @@ def queue_builds(event, context): 'ubuntu-2204', 'ubuntu-2004', 'ubuntu-1804', - 'opensuse-152', 'opensuse-153', 'centos-8', 'debian-10', diff --git a/serverless-resources.yml b/serverless-resources.yml index 9fae387..5685ebb 100644 --- a/serverless-resources.yml +++ b/serverless-resources.yml @@ -257,20 +257,6 @@ rBuildsBatchJobDefinitionOpensuse42: Image: "#{AWS::AccountId}.dkr.ecr.#{AWS::Region}.amazonaws.com/r-builds:opensuse-42" Timeout: AttemptDurationSeconds: 7200 -rBuildsBatchJobDefinitionOpensuse152: - 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-152" - Timeout: - AttemptDurationSeconds: 7200 rBuildsBatchJobDefinitionOpensuse153: Type: AWS::Batch::JobDefinition Properties: diff --git a/serverless.yml b/serverless.yml index 400f18c..9a1224c 100644 --- a/serverless.yml +++ b/serverless.yml @@ -53,11 +53,9 @@ provider: Ref: rBuildsBatchJobDefinitionCentos8 JOB_DEFINITION_ARN_opensuse_42: Ref: rBuildsBatchJobDefinitionOpensuse42 - JOB_DEFINITION_ARN_opensuse_152: - Ref: rBuildsBatchJobDefinitionOpensuse152 JOB_DEFINITION_ARN_opensuse_153: Ref: rBuildsBatchJobDefinitionOpensuse153 - SUPPORTED_PLATFORMS: ubuntu-1804,ubuntu-2004,ubuntu-2204,debian-9,debian-10,debian-11,centos-7,centos-8,opensuse-42,opensuse-152,opensuse-153 + SUPPORTED_PLATFORMS: ubuntu-1804,ubuntu-2004,ubuntu-2204,debian-9,debian-10,debian-11,centos-7,centos-8,opensuse-42,opensuse-153 functions: queueBuilds: