Merge pull request #666 from rstudio/dev

Backwards compatibility fixes for `r-session-complete` on CentOS 7

.github/workflows/build-manual.yaml

@@ -95,6 +95,14 @@ jobs:
           EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64)
           ARGS_CMD=""
           USE_S3_DOWNLOAD_URL=""
+          VERSION_OVERRIDES=""
+          if [[ "${{inputs.os}}" == "centos7" ]]; then
+            # FIXME(ianpittwood): This is probably a silly way of doing this. We don't have CentOS builds for later 
+            #                     Python versions so we need to override them. This is done via matrix in the release CI
+            #                     but we don't have that here. We're also limited by the 10 input cap so these can't be
+            #                     passed by the user alongside R versions as I would've liked to do.
+            VERSION_OVERRIDES="PYTHON_VERSION=3.9.14 PYTHON_VERSION_ALT=3.8.15"
+          fi
           if [[ "${{ inputs.type }}" == "release" ]]; then
             ARGS_CMD="get-product-args"
             if [[ "${{ inputs.use_s3_download_url }}" == "true" ]]; then
@@ -105,6 +113,7 @@ jobs:
           fi
           BUILD_ARGS=$( \
               just -f ci.Justfile \
+              ${VERSION_OVERRIDES} \
               ${ARGS_CMD} \
               ${{ inputs.product }} \
               ${{ inputs.os }} \

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}" \