From ab11f64d6197254e7b850851e18ea77432f9bf1f Mon Sep 17 00:00:00 2001
From: Greg Lin <glin@rstudio.com>
Date: Mon, 7 Feb 2022 16:53:59 -0600
Subject: [PATCH] Use Rocky Linux 8 in place of CentOS 8

---
 README.md                   |  5 +++--
 builder/Dockerfile.centos-8 |  2 +-
 builder/docker-compose.yml  | 22 +++++++++++-----------
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index dce38b8..24fb6de 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,8 @@ bug, or ask questions on [RStudio Community](https://community.rstudio.com).
 R binaries are built for the following Linux operating systems:
 - Ubuntu 16.04, 18.04, 20.04
 - Debian 9, 10
-- CentOS / Red Hat Enterprise Linux 7, 8
+- CentOS 7
+- 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
 
@@ -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
 ```
 
diff --git a/builder/Dockerfile.centos-8 b/builder/Dockerfile.centos-8
index b506fa3..a5a0db1 100644
--- 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
 
diff --git a/builder/docker-compose.yml b/builder/docker-compose.yml
index 59906d2..4b77fe5 100644
--- a/builder/docker-compose.yml
+++ b/builder/docker-compose.yml
@@ -78,17 +78,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: