Update to rocker/r2u:24.04

Signed-off-by: Peter Solymos <psolymos@gmail.com>
analythium · Jul 2, 2024 · 8875064 · 8875064
1 parent 0e429be
commit 8875064
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
 FROM rocker/r2u:24.04
 RUN install.r remotes renv pak rconfig jsonlite yaml deps
 RUN installGithub.r analythium/deps
-RUN cp /usr/lib/R/site-library/deps/examples/03-cli/deps-cli.R /usr/local/bin/deps-cli
+RUN cp -p $(R RHOME)/library/deps/examples/03-cli/deps-cli.R /usr/local/bin/deps-cli
 RUN chmod +x /usr/local/bin/deps-cli
 CMD ["bash"]
diff --git a/README.Rmd b/README.Rmd
@@ -248,8 +248,9 @@ deps-cli create && deps-cli sysreqs && deps-cli install
 In a Dockerfile you can:
 
 ```Dockerfile
-FROM eddelbuettel/r2u:22.04
-RUN R -q -e "install.packages(c('rconfig', 'deps', 'remotes', 'pak', 'renv'), repos = c('https://cloud.r-project.org', 'https://analythium.r-universe.dev'))"
+FROM rocker/r2u:24.04
+RUN install.r remotes renv pak rconfig jsonlite yaml deps
+RUN installGithub.r analythium/deps
 RUN cp -p $(R RHOME)/library/deps/examples/03-cli/deps-cli.R /usr/local/bin/deps-cli
 RUN chmod +x /usr/local/bin/deps-cli
 

diff --git a/README.md b/README.md
@@ -288,8 +288,9 @@ detect dependencies: `renv.lock`, `pkg.lock`, and `DESCRIPTION`.
 In a Dockerfile you can:
 
 ``` dockerfile
-FROM eddelbuettel/r2u:22.04
-RUN R -q -e "install.packages(c('rconfig', 'deps', 'remotes', 'pak', 'renv'), repos = c('https://cloud.r-project.org', 'https://analythium.r-universe.dev'))"
+FROM rocker/r2u:24.04
+RUN install.r remotes renv pak rconfig jsonlite yaml deps
+RUN installGithub.r analythium/deps
 RUN cp -p $(R RHOME)/library/deps/examples/03-cli/deps-cli.R /usr/local/bin/deps-cli
 RUN chmod +x /usr/local/bin/deps-cli