Merge branch 'dev' into connect-release-2023.07.0

rstudio · Jul 27, 2023 · 0cd84fa · 0cd84fa
2 parents 8e11ab5 + 592354f
commit 0cd84fa
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/workbench-for-microsoft-azure-ml/Dockerfile.ubuntu2204 b/workbench-for-microsoft-azure-ml/Dockerfile.ubuntu2204
@@ -33,8 +33,7 @@ ENV DIAGNOSTIC_ONLY false
 
 ENV WORKBENCH_JUPYTER_PATH=/usr/local/bin/jupyter
 
-COPY --chmod=755 license-manager-shim /opt/rstudio-license/license-manager
-COPY --chmod=755 TurboActivate.dat /opt/rstudio-license/license-manager.conf
+COPY --chmod=0644 TurboActivate.dat /opt/rstudio-license/license-manager.conf
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN apt-get update \
@@ -53,6 +52,7 @@ RUN apt-get update \
       libxext6 \
       libxrender1 \
       oddjob-mkhomedir \
+      openssh-client \
       rrdtool \
       sssd \
       supervisor \
@@ -73,6 +73,7 @@ RUN apt-get update \
     && rm -rf /var/lib/apt/lists/* \
     && rm -rf /var/lib/rstudio-server/r-versions
 
+COPY --chmod=0755 license-manager-shim /opt/rstudio-license/license-manager
 COPY --chmod=0775 startup.sh /usr/local/bin/startup.sh
 COPY startup/* /startup/base/
 COPY startup-launcher/* /startup/launcher/

diff --git a/workbench-for-microsoft-azure-ml/install-r.sh b/workbench-for-microsoft-azure-ml/install-r.sh
@@ -31,7 +31,7 @@ install_r_packages() {
 }
 
 
-for rvers in 3.4.4 3.5.3 3.6.3 4.0.5 4.1.3 4.2.3; do
+for rvers in 3.6.3 4.0.5 4.1.3 4.2.3 4.3.1; do
     # install r version
     curl -O https://cdn.rstudio.com/r/ubuntu-$(lsb_release -rs | sed 's/\.//g')/pkgs/r-${rvers}_1_amd64.deb
     DEBIAN_FRONTEND=noninteractive apt-get install -y ./r-${rvers}_1_amd64.deb

diff --git a/workbench-for-microsoft-azure-ml/test/goss.yaml b/workbench-for-microsoft-azure-ml/test/goss.yaml
@@ -131,7 +131,7 @@ command:
 
   # test all R versions and packages
   # "/opt/R/3.3.3/bin/R" "/opt/R/3.4.4/bin/R"
-  {{ $rvers := mkSlice "/opt/R/3.5.3/bin/R" "/opt/R/3.6.3/bin/R" "/opt/R/4.0.5/bin/R" "/opt/R/4.1.3/bin/R" "/opt/R/4.2.3/bin/R"}}
+  {{ $rvers := mkSlice "/opt/R/3.6.3/bin/R" "/opt/R/4.0.5/bin/R" "/opt/R/4.1.3/bin/R" "/opt/R/4.2.3/bin/R" "/opt/R/4.3.1/bin/R"}}
   {{ $pkgs := .Vars.packages}}
   # loops the library command for each R version to ensure expected libraries exist for all.
   # notably, it also ensures that each expected R version exists and is runnable

diff --git a/workbench-for-microsoft-azure-ml/test/goss_vars.yaml b/workbench-for-microsoft-azure-ml/test/goss_vars.yaml
@@ -20,7 +20,7 @@ syspkgs:
   - libglib2.0-0
   - libpq5
   - libsm6
-  - libssl1.0.0
+  - libssl-dev
   - openssl
   - libssl-dev
   - libuser