Remove unused Workbench Components #624
Draft
+388
−3
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
merge dev to main
Merge dev to main
Revert version changes for products (#603)
Change prerelease builds to R 4.2.3/4.1.3 and Python 3.9.17/3.8.17
ianpittwood
requested changes
Aug 15, 2023
There was a problem hiding this comment.
Looks good so far. Just a few comments:
- We should update the
sedtargets in the rootJustfileso versions get updated appropriately in the newworkbench-session-rstudio-proimages. - We should eventually add these builds into the workflows too. That should be as easy as adding in some more entries to the matrices.
- Is it possible we'll add more session images for Workbench? If so, it may be best to layer this in as a subdirectory like
workbench-session/rstudio-pro.
| @@ -5,7 +5,7 @@ ARG PYTHON_VERSION_ALT=3.8.15 | |||
| ARG SRC_IMAGE_NAME=product-base-pro | |||
| ARG REGISTRY=ghcr.io | |||
| FROM ${REGISTRY}/rstudio/${SRC_IMAGE_NAME}:centos7-r${R_VERSION}_${R_VERSION_ALT}-py${PYTHON_VERSION}_${PYTHON_VERSION_ALT} | |||
| LABEL maintainer="RStudio Docker <[email protected]>"` | |||
| LABEL maintainer="RStudio Docker <[email protected]>" | |||
There was a problem hiding this comment.
Mind changing this to "@posit.co" while we're at it?
| rm -rf /usr/lib/rstudio-server/www-workspaces | ||
| rm -rf /usr/lib/rstudio-server/db | ||
| rm -rf /usr/lib/rstudio-server/conf | ||
| rm -rf /usr/lib/rstudio-server/extras |
There was a problem hiding this comment.
nit: extra line at end of file
Comment on lines
+4
to
+29
| rm /usr/lib/rstudio-server/bin/rserver-saml | ||
| rm /usr/lib/rstudio-server/bin/rserver-openid | ||
| rm /usr/lib/rstudio-server/bin/librclient.so | ||
| rm /usr/lib/rstudio-server/bin/librserver.so | ||
| rm /usr/lib/rstudio-server/bin/license-manager | ||
| rm /usr/lib/rstudio-server/bin/license-manager.conf | ||
| rm /usr/lib/rstudio-server/bin/locktester | ||
| rm /usr/lib/rstudio-server/bin/migrate.sh | ||
| rm /usr/lib/rstudio-server/bin/pamtester | ||
| rm /usr/lib/rstudio-server/bin/rpcsend | ||
| rm /usr/lib/rstudio-server/bin/rserver | ||
| rm /usr/lib/rstudio-server/bin/rserver-acls | ||
| rm /usr/lib/rstudio-server/bin/rserver-admin | ||
| rm /usr/lib/rstudio-server/bin/rserver-db | ||
| rm /usr/lib/rstudio-server/bin/rserver-encrypt | ||
| rm /usr/lib/rstudio-server/bin/rserver-http | ||
| rm /usr/lib/rstudio-server/bin/rserver-monitor | ||
| rm /usr/lib/rstudio-server/bin/rserver-pam | ||
| rm /usr/lib/rstudio-server/bin/rserver-session-reaper | ||
| rm /usr/lib/rstudio-server/bin/rstudio-kubernetes-launcher | ||
| rm /usr/lib/rstudio-server/bin/rstudio-launcher | ||
| rm /usr/lib/rstudio-server/bin/rstudio-launcher.sh | ||
| rm /usr/lib/rstudio-server/bin/rstudio-local-launcher | ||
| rm /usr/lib/rstudio-server/bin/rstudio-server | ||
| rm /usr/lib/rstudio-server/bin/rstudio-slurm-launcher | ||
| rm /usr/lib/rstudio-server/bin/run-diagnostics |
There was a problem hiding this comment.
Should these also have -f?
There was a problem hiding this comment.
Happy to change it, but for some reason only the r-versions file had trouble
There was a problem hiding this comment.
That's strange. Is it the only one present at the time this runs perhaps?
There was a problem hiding this comment.
No, I'm guessing is a permissions thing. The other ones are definitely present before this runs
| rm -rf /usr/lib/rstudio-server/bin/code-server | ||
| rm -rf /usr/lib/rstudio-server/bin/vscode-workbench-ext | ||
| rm /usr/lib/rstudio-server/bin/jupyter-session-run | ||
| rm /usr/lib/rstudio-server/bin/vscode-session-run |
|
|
msarahan
approved these changes
Aug 15, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR removes unused Workbench components to reduce the surface area for security vulnerabilities in the images. It also adds an "RStudio Pro session"-only image for certain use-cases.