Merge pull request #34 from NASA-Openscapes/dev

Merge recent changes from dev and VSCode installation into main
NASA-Openscapes · Oct 1, 2024 · 14b5e99 · 14b5e99
2 parents 378ad84 + 91640aa
commit 14b5e99
Show file tree

Hide file tree

Showing 12 changed files with 9,569 additions and 987 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - main
+      - dev
 
 jobs:
   build-and-push-docker:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## corn v2024.03.10
+* added jupyter
+* Quarto now installs from conda-forge, there is no ARM version.
+* conda-lock for OSX and Linux
+* updated earthaccess to 0.9.0
+* included flox for xarray
+* included an opendap kernel to address some issues with v1.9
+
 ## corn v2023.08.04
 * removed collaboration as is incompatible with Jupyterlab v3.x
 

diff --git a/ci/Dockerfile b/ci/Dockerfile
@@ -1,15 +1,9 @@
-FROM pangeo/base-image:2023.01.13
+FROM pangeo/base-image:2024.08.18
 # build file for pangeo images
 RUN conda init zsh && conda init bash
 
 COPY --chown=jovyan:jovyan . /home/jovyan/.kernels
 
-USER root
-
-ENV QUARTO_CLI=https://github.com/quarto-dev/quarto-cli/releases/download/v1.4.555/quarto-1.4.555-linux-amd64.deb
-
-RUN wget -O /tmp/quarto.deb ${QUARTO_CLI} && dpkg -i /tmp/quarto.deb && rm -rf /tmp/quarto.deb && apt-get clean
-
 USER ${NB_USER}
 
 WORKDIR ${HOME}/.kernels

diff --git a/ci/apt.txt b/ci/apt.txt
@@ -14,12 +14,3 @@ xclip
 ffmpeg
 build-essential
 software-properties-common
-
-libgl1-mesa-glx
-dbus-x11
-xorg
-xfce4
-xfce4-panel
-xfce4-session
-xfce4-settings
-xubuntu-icon-theme
diff --git a/ci/conda-linux-64.lock b/ci/conda-linux-64.lock
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,7 @@ on: @@
       push:
         branches:
           - main
+          - dev
     jobs:
       build-and-push-docker:
@@ Expand Down @@