Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ignore existing launcher certs in Workbench builds #722

Closed
wants to merge 2 commits into from
Closed

Ignore existing launcher certs in Workbench builds #722

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
70e3b8f
Ignore launcher certs in builds
ianpittwood Apr 17, 2024
0f25cef
Try patching launcher.pem perms
ianpittwood Apr 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions workbench/.dockerignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
**/launcher.pem
**/launcher.pub
4 changes: 2 additions & 2 deletions workbench/Dockerfile.ubuntu2204
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]


2 changes: 1 addition & 1 deletion workbench/conf/launcher-env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading