-
Notifications
You must be signed in to change notification settings - Fork 57
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.
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
Remove the unused pandoc and TeX installations from the RSPM image #300
Open
atheriel
wants to merge
1
commit into
main
Choose a base branch
from
rspm-no-tex-and-pandoc
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,28 @@ | ||
ARG R_VERSION=3.6.2 | ||
FROM rstudio/r-base:${R_VERSION}-bionic | ||
FROM ubuntu:bionic | ||
LABEL maintainer="RStudio Docker <[email protected]>" | ||
|
||
# System dependendies and an R installation for package builds -----------------# | ||
ARG R_VERSION=3.6.2 | ||
ARG R_DOWNLOAD_URL=https://cdn.rstudio.com/r/ubuntu-1804/pkgs | ||
RUN apt-get update -qq \ | ||
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ | ||
ca-certificates \ | ||
curl \ | ||
locales \ | ||
&& curl -O ${R_DOWNLOAD_URL}/r-${R_VERSION}_1_amd64.deb \ | ||
&& DEBIAN_FRONTEND=noninteractive apt-get install -f -y ./r-${R_VERSION}_1_amd64.deb \ | ||
&& rm r-${R_VERSION}_1_amd64.deb \ | ||
&& rm -rf /var/lib/apt/lists/* \ | ||
&& ln -s /opt/R/${R_VERSION}/bin/R /usr/bin/R \ | ||
&& ln -s /opt/R/${R_VERSION}/bin/Rscript /usr/bin/Rscript \ | ||
&& ln -s /opt/R/${R_VERSION}/lib/R /usr/lib/R | ||
|
||
# Locale configuration --------------------------------------------------------# | ||
RUN localedef -i en_US -f UTF-8 en_US.UTF-8 | ||
ENV LANG en_US.UTF-8 | ||
ENV LANGUAGE en_US:en | ||
ENV LC_ALL en_US.UTF-8 | ||
ENV DEBIAN_FRONTEND=noninteractive | ||
ENV TZ UTC | ||
|
||
ENV PATH /opt/rstudio-pm/bin:$PATH | ||
|
||
|
@@ -25,7 +40,7 @@ EXPOSE 2112/tcp | |
ARG RSPM_VERSION=2022.04.0-7 | ||
ARG RSPM_DOWNLOAD_URL=https://cdn.rstudio.com/package-manager/ubuntu/amd64 | ||
RUN apt-get update --fix-missing \ | ||
&& apt-get install -y --no-install-recommends gdebi-core dpkg-sig \ | ||
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gdebi-core dpkg-sig \ | ||
&& curl -O ${RSPM_DOWNLOAD_URL}/rstudio-pm_${RSPM_VERSION}_amd64.deb \ | ||
&& gpg --keyserver keyserver.ubuntu.com --recv-keys 3F32EE77E331692F \ | ||
&& dpkg-sig --verify rstudio-pm_${RSPM_VERSION}_amd64.deb \ | ||
|
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looking at this now, I think it was a mistake that we symlinked R to the OS default
/usr/bin
instead of/usr/local/bin
in the rstudio/r-base images. The symlink to/usr/lib
also isn't necessary at all, I copy pasted that from somewhere else 😬. I don't know if any users would ever want to switch their R versions here, but using/usr/local/bin
would be nice for consistency with the instructions at https://docs.rstudio.com/resources/install-r/#create-a-symlink-to-rThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Or we could remove it since RSPM doesn't need R to be on the PATH. Unless users might be running R scripts in this image.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I doubt that users would be running R scripts in this image 😮 At least I hope that would not be the case, I guess it is possible with some type of CI / etc. but definitely not a happy path recommendation 😄
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Definitely not the happy path. I'll remove these symlinks.