diff --git a/geocompy/Dockerfile b/geocompy/Dockerfile index 8e889f0..15ba056 100644 --- a/geocompy/Dockerfile +++ b/geocompy/Dockerfile @@ -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')" \ No newline at end of file +RUN R -e "remotes::install_github('geocompx/geocompkg', upgrade = TRUE)" \ No newline at end of file diff --git a/minimal/Dockerfile b/minimal/Dockerfile index 88b5599..1b1db2a 100644 --- a/minimal/Dockerfile +++ b/minimal/Dockerfile @@ -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 diff --git a/osgeo/Dockerfile b/osgeo/Dockerfile index 9fbd822..ebdee95 100644 --- a/osgeo/Dockerfile +++ b/osgeo/Dockerfile @@ -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: diff --git a/rust/Dockerfile b/rust/Dockerfile index fd5093c..42a9408 100644 --- a/rust/Dockerfile +++ b/rust/Dockerfile @@ -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: diff --git a/suggests/Dockerfile b/suggests/Dockerfile index d660105..6370a7b 100644 --- a/suggests/Dockerfile +++ b/suggests/Dockerfile @@ -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 && \