From 32127f485daba7039ef8fdab9c2301c92a4f4fe6 Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Sun, 28 Apr 2024 18:00:24 +0200 Subject: [PATCH] See #25460. Google Earth extensions. --- Dockerfile | 44 ++----------------- ...atlas-vlab5 => Jenkinsfile-itineris-gearth | 4 +- install2r-packages.txt | 22 ++-------- 3 files changed, 9 insertions(+), 61 deletions(-) rename Jenkinsfile-fisheriesatlas-vlab5 => Jenkinsfile-itineris-gearth (91%) diff --git a/Dockerfile b/Dockerfile index 05fa027..1c4b443 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,46 +8,11 @@ LABEL org.d4science.image.licenses="EUPL-1.2" \ # R required by vlab5 VRE https://support.d4science.org/issues/23536 ENV DEBIAN_FRONTEND noninteractive -# Upgrade, install some R dependencies and base python3 -# Add libcurl4-gnutls-dev and remove libcurl4-openssl-dev because -# -# libraptor2-dev : Depends: libcurl4-gnutls-dev but it is not installable RUN apt-get update --yes && \ apt-get install --yes --no-install-recommends \ - libgdal-dev \ - pandoc \ - pandoc-citeproc \ - texlive-xetex \ - texlive-latex-base \ - texlive-latex-recommended \ - texlive-fonts-recommended \ - texlive-fonts-extra \ - texlive-formats-extra \ - libssl-dev \ - libxml2-dev \ - libv8-dev \ - libsecret-1-dev \ - librdf0-dev \ - libgit2-dev \ - libxslt-dev \ - librdf0 \ - redland-utils \ - rasqal-utils \ - raptor2-utils \ - libcairo2-dev \ - libpoppler-cpp-dev \ - libmagick++-dev \ - cmake \ - cargo \ - libavfilter-dev \ - libjq-dev \ - libprotobuf-dev \ - protobuf-compiler \ - libproj-dev \ - libcurl4-gnutls-dev \ - libsodium-dev \ - libudunits2-dev \ - libglpk40 + apt-transport-https ca-certificates gnupg curl vim nano + +RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt cloud-sdk main" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list && curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | gpg --dearmor -o /usr/share/keyrings/cloud.google.gpg && apt-get update -y && apt-get install google-cloud-sdk google-cloud-cli google-cloud-cli-app-engine-java google-cloud-cli-app-engine-python kubectl -y RUN mkdir -p /opt/workspace-lib RUN mkdir /var/log/workspace-lib @@ -57,8 +22,7 @@ RUN chmod 0644 /opt/workspace-lib/fuse-workspace.jar COPY install2r-packages.txt /rocker_scripts RUN for f in `cat /rocker_scripts/install2r-packages.txt` ; do install2.r --error --skipinstalled --ncpus -1 $f || exit 1 ; done -RUN installGithub.r -d TRUE -u FALSE -r https://packagemanager.rstudio.com/all/__linux__/jammy/latest r-geoflow/geoflow -RUN installGithub.r -d TRUE -u FALSE -r https://packagemanager.rstudio.com/all/__linux__/jammy/latest hrbrmstr/streamgraph +RUN installGithub.r -d TRUE -u FALSE -r https://packagemanager.rstudio.com/all/__linux__/jammy/latest r-earthengine/rgeeExtra # Rstudio settings COPY rsession.conf /etc/rstudio/rsession.conf diff --git a/Jenkinsfile-fisheriesatlas-vlab5 b/Jenkinsfile-itineris-gearth similarity index 91% rename from Jenkinsfile-fisheriesatlas-vlab5 rename to Jenkinsfile-itineris-gearth index 16f58c2..71bcbb2 100644 --- a/Jenkinsfile-fisheriesatlas-vlab5 +++ b/Jenkinsfile-itineris-gearth @@ -9,7 +9,7 @@ pipeline { label 'docker' } environment { - imagename = "rstudio/rstudio-fisheriesatlas-vlab5" + imagename = "rstudio/rstudio-itineris-gearth" hubname = "hub.dev.d4science.org" registryUrl = "https://hub.dev.d4science.org" registryCredential = 'cccd3cf5-9d6c-4044-85d6-59bede0c43f4' @@ -19,7 +19,7 @@ pipeline { stages { // stage('Cloning Git') { // steps { - // git([url: git_url, branch: 'fisheriesatlas-vlab5', credentialsId: '88b54962-1c0e-49cb-8155-22276860f346']) + // git([url: git_url, branch: 'itineris_gearth', credentialsId: '88b54962-1c0e-49cb-8155-22276860f346']) // } // } stage('Building image') { diff --git a/install2r-packages.txt b/install2r-packages.txt index 7bf14f2..9f008f5 100644 --- a/install2r-packages.txt +++ b/install2r-packages.txt @@ -1,20 +1,4 @@ -remotes -dotenv -here -magick -pbdZMQ -nloptr -tinytex -rpostgis -gargle +reticulate +rgee googledrive -gsheet -renv -shinyWidgets -leaflet -leaflet.extras -leaflet.minicharts -leafpm -mapedit -xml2 -pals +googleCloudStorageR