Skip to content

Commit

Permalink
try adjusting dockerfile syntax slightly
Browse files Browse the repository at this point in the history
  • Loading branch information
bschilder committed Nov 17, 2023
1 parent 136b787 commit 2780ad8
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ runs:
GITHUB_TOKEN: ${{ inputs.GITHUB_TOKEN }}
run: |
options(crayon.enabled = TRUE)
## Devel version of remotes required to due bugs in current CRAN release
## Use devel version of remotes required to due bugs in current CRAN release
remotes::install_github("r-lib/remotes", upgrade = TRUE)
if(!require("rworkflows", quietly=TRUE)) remotes::install_github("neurogenomics/rworkflows@dev", upgrade=TRUE)
shell: Rscript {0}
Expand Down
10 changes: 5 additions & 5 deletions inst/templates/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ RUN mkdir -p /$PKG
ADD . /$PKG
WORKDIR /$PKG
#### --Step 3--: Install rworkflows ####
RUN Rscript -e 'if(!require("remotes")) install.packages("remotes"); \
RUN Rscript -e 'if(!require("remotes")) install.packages("remotes"); \
if(!require("rworkflows")) remotes::install_github("neurogenomics/rworkflows@dev");'
#### --Step 4--: Install system dependencies ####
RUN sysreqs=$(Rscript -e 'rworkflows::dependencies_linux()') \
RUN sysreqs=$(Rscript -e 'rworkflows::dependencies_linux()') \
sudo -s eval "$sysreqs"
#### --Step 5--:Install package dependencies ####
RUN Rscript -e 'options(download.file.method="libcurl", crayon.enabled=TRUE, timeout={TIMEOUT}); \
RUN Rscript -e 'options(download.file.method="libcurl", crayon.enabled=TRUE, timeout={TIMEOUT}); \
if(!require("BiocManager",quietly=TRUE)) install.packages("BiocManager"); \
repos <- BiocManager::repositories(); \
remotes::install_local(repos=repos, dependencies=TRUE, build_vignettes=FALSE, upgrade=TRUE, force=TRUE);'
repos <- BiocManager::repositories(); \
remotes::install_local(repos=repos, dependencies=TRUE, build_vignettes=FALSE, upgrade=TRUE, force=TRUE);'
RUN rm -rf /$PKG

0 comments on commit 2780ad8

Please sign in to comment.