Skip to content

Commit

Permalink
Use remotes throughout
Browse files Browse the repository at this point in the history
  • Loading branch information
Robinlovelace committed Sep 27, 2024
1 parent 32e47e5 commit 9746d8c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 14 deletions.
2 changes: 1 addition & 1 deletion qgis/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,6 @@ RUN echo 'options(repos = "https://packagemanager.posit.co/cran/latest")' >> /us
RUN Rscript -e "install.packages('remotes')"
# RUN Rscript -e "remotes::install_github('r-spatial/sf')"
# RUN Rscript -e "remotes::install_github('rspatial/terra')"
RUN Rscript -e 'install.packages("geocompkg", repos = c("https://geocompr.r-universe.dev", "https://cloud.r-project.org"), dependencies = TRUE, force = TRUE)'
RUN R -e "remotes::install_github('geocompx/geocompkg', upgrade = TRUE, dependencies = TRUE)"


14 changes: 1 addition & 13 deletions suggests/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,17 +1,5 @@
FROM ghcr.io/geocompx/docker:latest
FROM ghcr.io/geocompx/docker:minimal
# RUN --mount=type=secret,id=GITHUB_PAT \
# echo "GITHUB_PAT=$(cat /run/secrets/GITHUB_PAT)" > ~/.Renviron
# RUN R -e "remotes::install_github('geocompr/geocompkg', upgrade = TRUE, dependencies = TRUE, force = TRUE)"
RUN R -e "remotes::install_github('geocompx/geocompkg', upgrade = TRUE, dependencies = TRUE)"
RUN su rstudio && \
cd /home/rstudio && \
wget https://github.com/geocompx/geocompr/archive/main.zip && \
unzip main.zip && \
mv geocompr-main /home/rstudio/geocompr && \
rm main.zip
RUN chown -Rv rstudio /home/rstudio/geocompr
# Set RStudio preferences
# No inline code:
RUN echo '{' >> /etc/rstudio/rstudio-prefs.json
RUN echo ' "rmd_chunk_output_inline": false' >> /etc/rstudio/rstudio-prefs.json
RUN echo '}' >> /etc/rstudio/rstudio-prefs.json

0 comments on commit 9746d8c

Please sign in to comment.