Skip to content

Commit

Permalink
Add setup for {conflicted} to Dockerfile
Browse files Browse the repository at this point in the history
  • Loading branch information
joelnitta committed Dec 6, 2023
1 parent 05ada77 commit f8a7912
Showing 1 changed file with 16 additions and 0 deletions.
16 changes: 16 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,22 @@ RUN echo '#!/bin/bash' >> /usr/local/bin/$APPNAME && \
echo "python /apps/SuperCRUNCH-$SC_VERSION/supercrunch-scripts/\"\$@\"" >> /usr/local/bin/$APPNAME && \
chmod 755 /usr/local/bin/$APPNAME

########################
### Setup conflicted ###
########################

# Normally put calls to `conflicted::conflicts_prefer()` in project-level
# .Rprofile, but for some reason this is being ignored by {targets} when
# running steps in parallel

RUN R -q -e 'install.packages("conflicted")'

COPY R/resolve_conflicts.R /resolve_conflicts.R

RUN cat /resolve_conflicts.R >> /usr/local/lib/R/etc/Rprofile.site

RUN rm /resolve_conflicts.R

####################################
### Install R packages with renv ###
####################################
Expand Down

0 comments on commit f8a7912

Please sign in to comment.