diff --git a/.devcontainer/install.R b/.devcontainer/install.R index 760d0fc..33d5fb6 100755 --- a/.devcontainer/install.R +++ b/.devcontainer/install.R @@ -4,7 +4,7 @@ # We could use renv.lock approach here instead, but will force re-creation of environment from scratch # Does not provide a good way to ensure that sf/terra/gdalcubes are installed from source while other packages can be binary -install.packages(c("rstac", "spData", "earthdatalogin", "quarto", "pak")) +install.packages(c("rstac", "spData", "earthdatalogin", "quarto", "pak", "decor")) pak::pkg_install('github::r-tmap/tmap') # vscode and jupyter plugins diff --git a/.devcontainer/jupyter-requirements.txt b/.devcontainer/jupyter-requirements.txt index 1cc0219..6dba969 100644 --- a/.devcontainer/jupyter-requirements.txt +++ b/.devcontainer/jupyter-requirements.txt @@ -25,6 +25,7 @@ jupyterlab-git jupyter-tensorboard-proxy jupyter-resource-usage jupyter-vscode-proxy +jupyter-rsession-proxy jupyter-book jupyterlab_myst gh-scoped-creds diff --git a/.devcontainer/jupyterhub.Dockerfile b/.devcontainer/jupyterhub.Dockerfile index f967fde..319baad 100644 --- a/.devcontainer/jupyterhub.Dockerfile +++ b/.devcontainer/jupyterhub.Dockerfile @@ -1,4 +1,4 @@ -## devcontainer-focused Rocker +# devcontainer-focused Rocker FROM ghcr.io/rocker-org/devcontainer/tidyverse:4.3 ## latest version of geospatial libs @@ -19,8 +19,8 @@ RUN chown ${NB_USER}:staff -R ${R_HOME}/site-library RUN git config --system pull.rebase false && \ git config --system credential.helper 'cache --timeout=36000' -## codeserver -RUN curl -fsSL https://code-server.dev/install.sh | sh +# codeserver +RUN curl -fsSL https://code-server.dev/install.sh | sh && rm -rf .cache USER rstudio WORKDIR /home/rstudio @@ -28,10 +28,10 @@ RUN usermod -s /bin/bash rstudio ENV PATH=$PATH:/home/rstudio/.local/bin COPY jupyter-requirements.txt jupyter-requirements.txt -RUN python -m pip install -r jupyter-requirements.txt && rm jupyter-requirements.txt +RUN python -m pip install --no-cache-dir -r jupyter-requirements.txt && rm jupyter-requirements.txt COPY nasa-requirements.txt requirements.txt -RUN python -m pip install -r requirements.txt && rm requirements.txt +RUN python -m pip install --no-cache-dir -r requirements.txt && rm requirements.txt COPY install.R install.R RUN Rscript install.R && rm install.R diff --git a/.github/workflows/test-build.yaml b/.github/workflows/test-build.yaml index 50571a2..abff0dd 100644 --- a/.github/workflows/test-build.yaml +++ b/.github/workflows/test-build.yaml @@ -24,4 +24,5 @@ jobs: - name: Render run: | - quarto render --no-cache + rm -rf _freeze + quarto render diff --git a/_quarto.yml b/_quarto.yml index c9fc04c..22edb13 100644 --- a/_quarto.yml +++ b/_quarto.yml @@ -33,17 +33,15 @@ website: - text: JuypterHub icon: cloud href: https://openscapes.2i2c.cloud/ - - section: Recipes + - section: Tutorials contents: - text: Introduction icon: play-btn href: contents/intro.qmd - - text: Biodiversity Priorities - icon: tree-fill - href: contents/ace.qmd - text: NASA EarthData icon: rocket href: contents/earthdata.qmd + - section: Recipes - section: Background contents: - text: Portable Environments diff --git a/contents/ace.qmd b/drafts/ace.qmd similarity index 100% rename from contents/ace.qmd rename to drafts/ace.qmd diff --git a/contents/bii_hexes.html b/drafts/bii_hexes.html similarity index 100% rename from contents/bii_hexes.html rename to drafts/bii_hexes.html