Skip to content

Commit

Permalink
fix: novnc and CI (#7)
Browse files Browse the repository at this point in the history
* fix: logo, default directory creation and add dockerignore

* fix: vnc issue when selecting text would crash the remote desktop

* fix: change qgis version + add set -e in install scripts

* fix: repo2docker compatibility

* fix: CI tests

* chore: add debug for repo2docker + update pangeo-notebook packages

* chore: pytorch conda-lock
  • Loading branch information
eroan-marie authored Dec 16, 2024
1 parent 9d3be28 commit c92eb66
Show file tree
Hide file tree
Showing 36 changed files with 11,255 additions and 5,799 deletions.
2 changes: 0 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
-include .env

# Makefile for convenience, (doesn't look for command outputs)
.PHONY: all
all: base-image base-notebook pangeo-notebook pytorch-notebook
Expand Down
27 changes: 17 additions & 10 deletions base-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ ONBUILD RUN echo "Checking for 'jupyter_notebook_config.py'..." \
&& cp jupyter_notebook_config.py /etc/jupyter \
; fi

# ONBUILD USER ${NB_USER}
ONBUILD USER ${NB_USER}

# We want to keep our images as reproducible as possible. If a lock
# file with exact versions of all required packages is present, we use
Expand Down Expand Up @@ -186,16 +186,23 @@ ONBUILD RUN echo "Checking for pip 'requirements.txt'..." \

ONBUILD USER root

ONBUILD COPY resources/layer-cleanup.sh /usr/local/bin
ONBUILD RUN chmod +x /usr/local/bin/layer-cleanup.sh
ONBUILD RUN echo "Copy 'layer-cleanup'..." \
; [ -d binder ] && cd binder \
; [ -d .binder ] && cd .binder \
; pwd; ls \
; cp resources/layer-cleanup.sh /usr/local/bin/ \
; chmod +x /usr/local/bin/layer-cleanup.sh

ONBUILD RUN for script in $(find "resources" -type f -name "install.sh"); do \
chmod +x "$script"; \
echo "Executing $script"; \
bash "$script"; \
layer-cleanup.sh; \
chown -R ${NB_USER}:${NB_USER} ${HOME}; \
done
ONBUILD RUN echo "Executing install scripts..." \
; [ -d binder ] && cd binder \
; [ -d .binder ] && cd .binder \
; for script in $(find "resources" -type f -name "install.sh"); do \
chmod +x "$script"; \
echo "Executing $script"; \
bash "$script"; \
layer-cleanup.sh; \
chown -R ${NB_USER}:${NB_USER} ${HOME}; \
done

ONBUILD USER ${NB_USER}

Expand Down
4 changes: 4 additions & 0 deletions base-notebook/.dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Dockerfile
environment.yml
packages.txt
.dockerignore
383 changes: 191 additions & 192 deletions base-notebook/conda-linux-64.lock

Large diffs are not rendered by default.

Loading

0 comments on commit c92eb66

Please sign in to comment.