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.

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

Fix build error for the rstudio image #10

Merged
merged 4 commits into from Oct 9, 2020
Merged

Conversation

Jswig
Copy link
Contributor

@Jswig Jswig commented Sep 21, 2020

The RStudio image does not have access to the devtools package to install containerit from Github. Fixed this to install and use remotes instead

@ivotron
Copy link
Contributor

ivotron commented Sep 21, 2020

can you please rebase master?

@ivotron
Copy link
Contributor

ivotron commented Sep 21, 2020

also, you can avoid having to reconcile changes on the upstream's master branch with your fork's master branch (which usually differ significantly due to squashed commits) by working on feature branches and open PRs from there. So you can first pull upstream changes to your local repo, then create a branch (from upstream's master) locally, and then push that branch to github and open a PR from there.

@Jswig
Copy link
Contributor Author

Jswig commented Oct 1, 2020

can you please rebase master?

This did not have any effect on my side. Am I missing something?

# move configuration file where rstudio server will find it
COPY rsession.conf /etc/rstudio

# install containerit
RUN R -e "devtools::install_github(\"o2r-project/containerit\")"
RUN R -e "install.packages(\"remotes\")" \
Copy link
Contributor

@ivotron ivotron Oct 2, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is missing an && \ at the end

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed. This should be ready to merge

@ivotron
Copy link
Contributor

ivotron commented Oct 2, 2020

This did not have any effect on my side. Am I missing something?

sorry, I think I got confused. I thought there was a merge conflict with master but there isn't one

@ivotron ivotron merged commit 3e8e847 into getpopper:master Oct 9, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants