Merge pull request #136 from rstudio/r452

glin · web-flow · commit db658ed1f1e6 · 2025-11-03T13:25:58.000-06:00
Update images for R 4.5.2
diff --git a/4.5/bookworm/Dockerfile b/4.5/bookworm/Dockerfile
@@ -7,7 +7,7 @@
 ARG BASE_IMAGE=posit/r-base
 FROM ${BASE_IMAGE}:bookworm
 
-ARG R_VERSION=4.5.1
+ARG R_VERSION=4.5.2
 ARG OS_IDENTIFIER=debian-12
 
 # Install R
diff --git a/4.5/bookworm/version.txt b/4.5/bookworm/version.txt
@@ -1 +1 @@
-4.5.1
+4.5.2
diff --git a/4.5/centos7/Dockerfile b/4.5/centos7/Dockerfile
@@ -7,7 +7,7 @@
 ARG BASE_IMAGE=posit/r-base
 FROM ${BASE_IMAGE}:centos7
 
-ARG R_VERSION=4.5.1
+ARG R_VERSION=4.5.2
 ARG OS_IDENTIFIER=centos-7
 
 # Install R
diff --git a/4.5/centos7/version.txt b/4.5/centos7/version.txt
@@ -1 +1 @@
-4.5.1
+4.5.2
diff --git a/4.5/focal/Dockerfile b/4.5/focal/Dockerfile
@@ -7,7 +7,7 @@
 ARG BASE_IMAGE=posit/r-base
 FROM ${BASE_IMAGE}:focal
 
-ARG R_VERSION=4.5.1
+ARG R_VERSION=4.5.2
 ARG OS_IDENTIFIER=ubuntu-2004
 
 # Install R
diff --git a/4.5/focal/version.txt b/4.5/focal/version.txt
@@ -1 +1 @@
-4.5.1
+4.5.2
diff --git a/4.5/jammy/Dockerfile b/4.5/jammy/Dockerfile
@@ -7,7 +7,7 @@
 ARG BASE_IMAGE=posit/r-base
 FROM ${BASE_IMAGE}:jammy
 
-ARG R_VERSION=4.5.1
+ARG R_VERSION=4.5.2
 ARG OS_IDENTIFIER=ubuntu-2204
 
 # Install R
diff --git a/4.5/jammy/version.txt b/4.5/jammy/version.txt
@@ -1 +1 @@
-4.5.1
+4.5.2
diff --git a/4.5/noble/Dockerfile b/4.5/noble/Dockerfile
@@ -7,7 +7,7 @@
 ARG BASE_IMAGE=posit/r-base
 FROM ${BASE_IMAGE}:noble
 
-ARG R_VERSION=4.5.1
+ARG R_VERSION=4.5.2
 ARG OS_IDENTIFIER=ubuntu-2404
 
 # Install R
diff --git a/4.5/noble/version.txt b/4.5/noble/version.txt
@@ -1 +1 @@
-4.5.1
+4.5.2
diff --git a/4.5/opensuse156/Dockerfile b/4.5/opensuse156/Dockerfile
@@ -7,7 +7,7 @@
 ARG BASE_IMAGE=posit/r-base
 FROM ${BASE_IMAGE}:opensuse156
 
-ARG R_VERSION=4.5.1
+ARG R_VERSION=4.5.2
 ARG OS_IDENTIFIER=opensuse-156
 
 # Install R
diff --git a/4.5/opensuse156/version.txt b/4.5/opensuse156/version.txt
@@ -1 +1 @@
-4.5.1
+4.5.2
diff --git a/4.5/rockylinux10/Dockerfile b/4.5/rockylinux10/Dockerfile
@@ -7,7 +7,7 @@
 ARG BASE_IMAGE=posit/r-base
 FROM ${BASE_IMAGE}:rockylinux10
 
-ARG R_VERSION=4.5.1
+ARG R_VERSION=4.5.2
 ARG OS_IDENTIFIER=rhel-10
 
 # Install R
diff --git a/4.5/rockylinux10/version.txt b/4.5/rockylinux10/version.txt
@@ -1 +1 @@
-4.5.1
+4.5.2
diff --git a/4.5/rockylinux8/Dockerfile b/4.5/rockylinux8/Dockerfile
@@ -7,7 +7,7 @@
 ARG BASE_IMAGE=posit/r-base
 FROM ${BASE_IMAGE}:rockylinux8
 
-ARG R_VERSION=4.5.1
+ARG R_VERSION=4.5.2
 ARG OS_IDENTIFIER=centos-8
 
 # Install R
diff --git a/4.5/rockylinux8/version.txt b/4.5/rockylinux8/version.txt
@@ -1 +1 @@
-4.5.1
+4.5.2
diff --git a/4.5/rockylinux9/Dockerfile b/4.5/rockylinux9/Dockerfile
@@ -7,7 +7,7 @@
 ARG BASE_IMAGE=posit/r-base
 FROM ${BASE_IMAGE}:rockylinux9
 
-ARG R_VERSION=4.5.1
+ARG R_VERSION=4.5.2
 ARG OS_IDENTIFIER=rhel-9
 
 # Install R
diff --git a/4.5/rockylinux9/version.txt b/4.5/rockylinux9/version.txt
@@ -1 +1 @@
-4.5.1
+4.5.2
diff --git a/Makefile b/Makefile
@@ -10,14 +10,14 @@ PATCH_VERSIONS ?= 3.1.3 3.2.5 3.3.3 3.4.4 3.5.3 \
 	4.2.0 4.2.1 4.2.2 4.2.3 \
 	4.3.0 4.3.1 4.3.2 4.3.3 \
 	4.4.0 4.4.1 4.4.2 4.4.3 \
-	4.5.0 4.5.1
+	4.5.0 4.5.1 4.5.2
 # INCLUDE_PATCH_VERSIONS, if set to `yes`, includes all patch versions in the
 # "all" targets.
 INCLUDE_PATCH_VERSIONS ?= no
 
 # Architecture used for the image tags, either amd64 or arm64.
 # ARCH can be omitted to directly push a single arch image.
-ARCH ?= $(shell arch | sed -e 's/aarch64/arm64/' -e 's/x86_64/amd64/')
+ARCH ?= $(shell uname -m | sed -e 's/aarch64/arm64/' -e 's/x86_64/amd64/')
 
 # When set, pushes to an alternate base image (used for pushing to the deprecated rstudio/r-base).
 TARGET_BASE_IMAGE ?=
diff --git a/update.sh b/update.sh
@@ -13,7 +13,7 @@ declare -A r_versions=(
     [4.2]='4.2.3'
     [4.3]='4.3.3'
     [4.4]='4.4.3'
-    [4.5]='4.5.1'
+    [4.5]='4.5.2'
     [devel]='devel'
     [next]='next'
 )
