Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge recent changes from dev and VSCode installation into main #34

Merged
merged 13 commits into from
Oct 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ on:
push:
branches:
- main
- dev

jobs:
build-and-push-docker:
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down
8 changes: 1 addition & 7 deletions ci/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
9 changes: 0 additions & 9 deletions ci/apt.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
668 changes: 0 additions & 668 deletions ci/conda-linux-64.lock

This file was deleted.

Loading
Loading