diff --git a/qgis/Dockerfile b/qgis/Dockerfile index 7f96b31..b40a4ec 100644 --- a/qgis/Dockerfile +++ b/qgis/Dockerfile @@ -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)" diff --git a/suggests/Dockerfile b/suggests/Dockerfile index 6370a7b..edadda5 100644 --- a/suggests/Dockerfile +++ b/suggests/Dockerfile @@ -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