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

Features/add pangeo workspace #25

Merged
merged 29 commits into from
Apr 17, 2023
Merged
Show file tree
Hide file tree
Changes from 28 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
5272a94
Merge branch 'develop' into features/add-pangeo-workspace
anilnatha Mar 22, 2023
a59439a
Moved location of conda-lock file for pangeo workspace because it coo…
anilnatha Mar 22, 2023
0f3122d
Fixed location where pangeo images can be found in the pangeo devfile.
anilnatha Mar 22, 2023
33dcf42
Force command execution of mamba install using conda lock to determin…
anilnatha Mar 22, 2023
2dc8578
Moved conda-linux-64.lock file location.
anilnatha Mar 22, 2023
a27c5e8
check pwd during build.
anilnatha Mar 22, 2023
d83151f
check pwd before running WORKDIR
anilnatha Mar 23, 2023
d5d53bf
Updated where the conda-lock file is being retrieved for ONBUILD comm…
anilnatha Mar 24, 2023
a9e18a8
Updated location of Pangeo lock file and added onbuild copy command t…
anilnatha Mar 29, 2023
a77bc57
moved conda-lock file.
anilnatha Mar 29, 2023
86cdb60
Added Cache busting for pangeo base image.
anilnatha Mar 29, 2023
241115f
Updated path for onbuild command in pangeo base image.
anilnatha Mar 29, 2023
d4c0778
Updated build image script for jupyterlab3-build.
anilnatha Mar 29, 2023
59e7896
Fixed improperly tagged image name in jupyterlab3-build build script
anilnatha Mar 29, 2023
58b49ab
Merge branch 'develop' into features/add-pangeo-workspace
anilnatha Apr 3, 2023
ff53b53
Removed unused IMAGE_NAME docker arg from jupyterlab3-build dockerfile.
anilnatha Apr 3, 2023
65f73b9
Added *.code-workspace to gitignore.
anilnatha Apr 12, 2023
cc52d57
Moved pangeo conda lock to jupyterlab3 folder and modified jupyterlab…
anilnatha Apr 12, 2023
fc8bad9
Merge branch 'develop' into features/add-pangeo-workspace
anilnatha Apr 13, 2023
e10297d
Testing nodejs install via CI.
anilnatha Apr 13, 2023
618b813
Merge branch 'develop' into features/add-pangeo-workspace
anilnatha Apr 17, 2023
e233455
Updated pangeo builds so that they can be built off of the jupyterlab…
anilnatha Apr 17, 2023
1f5e783
Fixed path to pangeo image in devfile.
anilnatha Apr 17, 2023
80b0352
Removed unneeded build script from jupyterlab3-build folder.
anilnatha Apr 17, 2023
5656707
Updated environment.yml file existence check in jupyterlab3 Dockerfile
anilnatha Apr 17, 2023
f069eb4
Removed unneeded CACHE_BUST variable from base images build script.
anilnatha Apr 17, 2023
d77ee10
Updated how environments yml detection is handled.
anilnatha Apr 17, 2023
bf0eec4
Updated pinned versions needed for pangeo workspace.
anilnatha Apr 17, 2023
0c44a8f
Updated channels for shared environment.yml
anilnatha Apr 17, 2023
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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@
built_images.txt

base_images/build-image-local.sh

*.code-workspace
15 changes: 6 additions & 9 deletions base_images/pangeo/docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
FROM continuumio/miniconda3:22.11.1
ENV LANG en_US.UTF-8
ENV TZ US/Pacific
ARG DEBIAN_FRONTEND=noninteractive

# install maap-py library
ENV MAAP_CONF='/maap-py/'
Expand All @@ -11,15 +14,9 @@ WORKDIR /projects
RUN sed -i -e 's/\/root/\/projects/g' /etc/passwd

RUN conda install -c conda-forge mamba && \
mamba install -c conda-forge -y conda-lock gdal=3.6.2 matplotlib=3.6.2 Cython=0.29.33 h5py=3.7.0 numba=0.56.4 \
pygeos=0.14 pyproj=3.4.1 rasterio=1.3.4 scipy=1.10.0

ONBUILD RUN echo "Checking for 'pangeo/conda-linux-64.lock'..." \
; if test -f "pangeo/conda-linux-64.lock" ; then \
mamba install --file pangeo/conda-linux-64.lock \
; fi

RUN find /opt/conda/ -follow -type f -name '*.a' -delete \
mamba install -c conda-forge -y gdal=3.6.2 matplotlib=3.6.2 Cython=0.29.33 h5py=3.7.0 numba=0.56.4 \
pygeos=0.14 pyproj=3.4.1 rasterio=1.3.4 scipy=1.10.0 \
&& find /opt/conda/ -follow -type f -name '*.a' -delete \
&& find /opt/conda/ -follow -type f -name '*.js.map' -delete \
&& /opt/conda/bin/conda clean -afy

Expand Down
2 changes: 1 addition & 1 deletion devfiles/pangeo/devfile/devfile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ components:
emptyDir: {}
containers:
- name: jupyter
image: 'mas.dit.maap-project.org/root/maap-workspaces/pangeo/pangeo:develop'
image: 'mas.dit.maap-project.org/root/maap-workspaces/jupyterlab3/pangeo:develop'
imagePullPolicy: Always
resources:
limits:
Expand Down
13 changes: 0 additions & 13 deletions jupyterlab3-build/build-image.sh

This file was deleted.

84 changes: 0 additions & 84 deletions jupyterlab3-build/docker/Dockerfile

This file was deleted.

125 changes: 0 additions & 125 deletions jupyterlab3-build/entrypoint.sh

This file was deleted.

43 changes: 0 additions & 43 deletions jupyterlab3-build/environments.json

This file was deleted.

11 changes: 0 additions & 11 deletions jupyterlab3-build/jupyter_patch

This file was deleted.

Loading