Skip to content

Commit

Permalink
Use remotes to install up-to-date pkgs installed
Browse files Browse the repository at this point in the history
  • Loading branch information
Robinlovelace committed Sep 25, 2024
1 parent 2b247d8 commit 32e47e5
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion geocompy/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
FROM glcr.b-data.ch/r/geospatial
RUN R -e "options(repos = c(geocompr = 'https://geocompr.r-universe.dev', CRAN = 'https://cloud.r-project.org')); install.packages('geocompkg')"
RUN R -e "remotes::install_github('geocompx/geocompkg', upgrade = TRUE)"
2 changes: 1 addition & 1 deletion minimal/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM rocker/geospatial:latest
RUN R -e "options(repos = c(geocompr = 'https://geocompr.r-universe.dev', CRAN = 'https://cloud.r-project.org')); install.packages('geocompkg')"
RUN R -e "remotes::install_github('geocompx/geocompkg', upgrade = TRUE)"

# Update quarto to latest stable version:
RUN /rocker_scripts/install_quarto.sh 1.5.57
Expand Down
2 changes: 1 addition & 1 deletion osgeo/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM rocker/geospatial:dev-osgeo
RUN R -e "options(repos = c(geocompr = 'https://geocompr.r-universe.dev', CRAN = 'https://cloud.r-project.org')); install.packages('geocompkg')"
RUN R -e "remotes::install_github('geocompx/geocompkg', upgrade = TRUE)"

# Set RStudio preferences
# No inline code:
Expand Down
2 changes: 1 addition & 1 deletion rust/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ RUN curl https://sh.rustup.rs -sSf | sh -s -- -y \
&& apt-get update \
&& sudo apt-get install -y osmium-tool

# RUN R -e "options(repos = c(geocompr = 'https://geocompr.r-universe.dev', CRAN = 'https://cloud.r-project.org')); install.packages('geocompkg', dependencies = TRUE)"
# RUN R -e "remotes::install_github('geocompx/geocompkg', upgrade = TRUE, dependencies = TRUE)"
RUN chown -Rv rstudio /home/rstudio/geocompr
# Set RStudio preferences
# No inline code:
Expand Down
2 changes: 1 addition & 1 deletion suggests/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM ghcr.io/geocompx/docker:latest
# 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 "options(repos = c(geocompr = 'https://geocompr.r-universe.dev', CRAN = 'https://cloud.r-project.org')); install.packages('geocompkg', dependencies = 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 && \
Expand Down

0 comments on commit 32e47e5

Please sign in to comment.