From 2cccab06e3cc2f0db6b8768b19de046e6ffee34d Mon Sep 17 00:00:00 2001
From: Ian Pittwood <ian.pittwood@rstudio.com>
Date: Wed, 8 Nov 2023 15:49:50 -0800
Subject: [PATCH] Workbench 2022.07.4 backwards compatibility with
 r-session-complete CentOS 7

---
 r-session-complete/Dockerfile.centos7 |  4 ++++
 r-session-complete/Justfile           | 10 ++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/r-session-complete/Dockerfile.centos7 b/r-session-complete/Dockerfile.centos7
index 37935d32..cf1d5237 100644
--- a/r-session-complete/Dockerfile.centos7
+++ b/r-session-complete/Dockerfile.centos7
@@ -34,6 +34,10 @@ RUN yum install -y subversion \
     && yum clean all \
     && rm -rf /var/lib/rstudio-server/r-versions
 
+COPY maybe_install_vs_code.sh /tmp/maybe_install_vs_code.sh
+RUN /tmp/maybe_install_vs_code.sh \
+    && rm /tmp/maybe_install_vs_code.sh
+
 RUN /opt/python/"${PYTHON_VERSION}"/bin/pip3 install \
       jupyter \
       jupyterlab=="${JUPYTERLAB_VERSION}" \
diff --git a/r-session-complete/Justfile b/r-session-complete/Justfile
index c58b0cae..9e12e7f5 100755
--- a/r-session-complete/Justfile
+++ b/r-session-complete/Justfile
@@ -7,6 +7,7 @@ PRODUCT := "r-session-complete"
 IMAGE_OS := "ubuntu2204"
 
 RSW_VERSION := "2023.09.1+494.pro2"
+RSW_RELEASE_TYPE := "release"
 RSW_LICENSE := ""
 
 DRIVERS_VERSION := "2023.05.0"
@@ -15,11 +16,11 @@ DRIVERS_VERSION_RHEL := DRIVERS_VERSION + "-1"
 R_VERSION := "4.2.3"
 R_VERSION_ALT := "4.1.3"
 
-PYTHON_VERSION := "3.9.14"
-PYTHON_VERSION_ALT := "3.8.15"
+PYTHON_VERSION := "3.9.17"
+PYTHON_VERSION_ALT := "3.8.17"
 
-_make-default-tag OS=IMAGE_OS:
-  echo "{{IMAGE_PREFIX}}{{PRODUCT}}:{{OS}}-$(just -f ../Justfile _get-tag-safe-version {{RSW_VERSION}})"
+_make-default-tag OS=IMAGE_OS VERSION=RSW_VERSION:
+  echo "{{IMAGE_PREFIX}}{{PRODUCT}}:{{OS}}-$(just -f ../Justfile _get-tag-safe-version {{VERSION}})"
 
 # Build r-session-complete image - just build ubuntu2204 2022.07.2+576.pro12 rstudio/r-session-complete:ubuntu2204-2022.07.2-576.pro12
 build OS=IMAGE_OS VERSION=RSW_VERSION *TAGS="":
@@ -55,6 +56,7 @@ build OS=IMAGE_OS VERSION=RSW_VERSION *TAGS="":
     --build-arg R_VERSION_ALT="{{ R_VERSION_ALT }}" \
     --build-arg PYTHON_VERSION="{{ PYTHON_VERSION }}" \
     --build-arg PYTHON_VERSION_ALT="{{ PYTHON_VERSION_ALT }}" \
+    --build-arg RSW_DOWNLOAD_URL="$(just -f ../ci.Justfile _get-rsw-download-url {{RSW_RELEASE_TYPE}} {{OS}})" \
     --file=./Dockerfile.$(just -f ../Justfile _parse-os {{OS}}) .
 
 # Test r-session-complete image - just test rstudio/r-session-complete:ubuntu2204-2022.07.2-576.pro12 2022.07.2+576.pro12