Update image with R 4.4.0 (#6)

* BPG v7.0.8 to v7.1.0 * update BPG version in README * update metadata.yaml * Update CHANGELOG * add code to install R v4.4.0 and remove r-cran-curl and r-cran-rgl * Update README * Update CHANGELOG.md * merge commands * define R base version * verify if GPG key fingerprint appears in gpg --show-keys output * update release year * Update CHANGELOG.md --------- Co-authored-by: Mootor <mmootor@ip-0A125257.rhxrlfvjyzbupc03cc22jkch3c.xx.internal.cloudapp.net> Co-authored-by: Mootor <mmootor@ip-0A125967.rhxrlfvjyzbupc03cc22jkch3c.xx.internal.cloudapp.net> Co-authored-by: Nick Wiltsie <[email protected]>
uclahs-cds · May 15, 2024 · 5d18120 · 5d18120
1 parent a0e80b1
commit 5d18120
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,21 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 ---
 
 ## [Unreleased]
+
+---
+## [7.1.0] - 2024-05-15
+## Changed
+- Add R version to `README.md`
+- Update R version to `4.4.0`
+
+---
+## [7.1.0] - 2023-12-23 [YANKED]
+### Changed
+- Update BPG `v7.0.8` to `v7.1.0`
+
+---
+
+## [7.0.8] - 2023-09-26
 ### Changed
 - Update BPG `v7.0.8` to `v7.1.0`
 

diff --git a/Dockerfile b/Dockerfile
@@ -3,21 +3,38 @@ FROM ubuntu:20.04
 
 ARG BPG_REPO='uclahs-cds/package-BoutrosLab-plotting-general'
 ARG BPG_VERSION=7.1.0
+ARG R_BASE_VERSION=4.4.0-1.2004.0
 ARG DEBIAN_FRONTEND=noninteractive
 
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
+    software-properties-common \
+    dirmngr \
     build-essential \
     gfortran \
     libcurl4-gnutls-dev \
     libharfbuzz-dev \
     libssl-dev \
     libxml2 \
     libxml2-dev \
-    r-base \
-    r-base-dev \
-    r-cran-curl \
-    r-cran-rgl \
+    wget \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+ARG FINGERPRINT=E298A3A825C0D65DFD57CBB651716619E084DAB9
+
+# add the signing key (by Michael Rutter) for these repos
+# To verify key, run gpg --show-keys /etc/apt/trusted.gpg.d/cran_ubuntu_key.asc
+# Fingerprint: E298A3A825C0D65DFD57CBB651716619E084DAB9
+# add the R 4.4 repo from CRAN -- adjust 'focal' to 'groovy' or 'bionic' as needed
+RUN wget -qO- https://cloud.r-project.org/bin/linux/ubuntu/marutter_pubkey.asc | tee -a /etc/apt/trusted.gpg.d/cran_ubuntu_key.asc \
+    && (gpg --show-keys --with-colons /etc/apt/trusted.gpg.d/cran_ubuntu_key.asc | grep "fpr:::::::::${FINGERPRINT}:") \
+    && add-apt-repository "deb https://cloud.r-project.org/bin/linux/ubuntu $(lsb_release -cs)-cran40/" \
+    && apt-get install -y --no-install-recommends \
+    r-base=${R_BASE_VERSION} \
+    r-base-dev=${R_BASE_VERSION} \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 

diff --git a/README.md b/README.md
@@ -13,6 +13,8 @@ Docker image versioning standard [here](https://uclahs-cds.atlassian.net/wiki/sp
 
 
 # Version
+The current image `v7.1.0` is built with R `v4.4.0`.
+
 | R Packages | Version | Type |
 |------|---------|---------|
 | BoutrosLab.plotting.general | `7.1.0` | main |
@@ -55,7 +57,7 @@ docker-BoutrosLabPlottingGeneral is licensed under the GNU General Public Licens
 
 docker-BoutrosLabPlottingGeneral can be used to create a docker instance of the Boutros Lab Plotting General.
 
-Copyright (C) 2023 University of California Los Angeles ("Boutros Lab") All rights reserved.
+Copyright (C) 2023-2024 University of California Los Angeles ("Boutros Lab") All rights reserved.
 
 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.