From 70e3b8f23aabacd22b9ec30725838b5b043b0820 Mon Sep 17 00:00:00 2001
From: Ian Pittwood <ian.pittwood@rstudio.com>
Date: Wed, 17 Apr 2024 07:46:35 -0700
Subject: [PATCH 1/2] Ignore launcher certs in builds

---
 workbench/.dockerignore | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 workbench/.dockerignore

diff --git a/workbench/.dockerignore b/workbench/.dockerignore
new file mode 100644
index 00000000..593bb05a
--- /dev/null
+++ b/workbench/.dockerignore
@@ -0,0 +1,2 @@
+**/launcher.pem
+**/launcher.pub
\ No newline at end of file

From 0f25cefa02ad3bc8c005cf4fb1834b4395f4645a Mon Sep 17 00:00:00 2001
From: Ian Pittwood <ian.pittwood@rstudio.com>
Date: Wed, 17 Apr 2024 12:21:54 -0700
Subject: [PATCH 2/2] Try patching launcher.pem perms

---
 workbench/Dockerfile.ubuntu2204 | 4 ++--
 workbench/conf/launcher-env     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/workbench/Dockerfile.ubuntu2204 b/workbench/Dockerfile.ubuntu2204
index 8234397e..1d878750 100644
--- a/workbench/Dockerfile.ubuntu2204
+++ b/workbench/Dockerfile.ubuntu2204
@@ -96,10 +96,10 @@ RUN mkdir -p /var/lib/rstudio-server/monitor/log && \
     mkdir -p /startup/custom/ && \
     printf '\n# allow home directory creation\nsession required pam_mkhomedir.so skel=/etc/skel umask=0022' >> /etc/pam.d/common-session
 
+RUN chmod 600 /etc/rstudio/launcher.pem || true  # Patch launcher.pem permissions if present
+
 EXPOSE 8787/tcp
 EXPOSE 5559/tcp
 
 ENTRYPOINT []
 CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf"]
-
-
diff --git a/workbench/conf/launcher-env b/workbench/conf/launcher-env
index 4ae3a261..d8127a52 100644
--- a/workbench/conf/launcher-env
+++ b/workbench/conf/launcher-env
@@ -3,4 +3,4 @@ Environment: LANG=en_US.UTF-8
     LANGUAGE=en_US:en
     LC_ALL=en_US.UTF-8
 JobType: any
-Environment: PATH=/opt/python/3.6.5/bin:$PATH
+Environment: PATH=/opt/python/default/bin:$PATH