v3.1.5 release

Makefile

@@ -0,0 +1,56 @@
+export IMAGE_NAME ?= vanilla
+export PROJECT_PREFIX = maap_
+export BASE_IMAGE_NAME = "${PROJECT_PREFIX}base_${IMAGE_NAME}"
+export JUPYTER_IMAGE_NAME = "${PROJECT_PREFIX}jupyter_${IMAGE_NAME}"
+export RUN_OPTIONS = 
+
+build-images: build-base-image build-jupyter-image		## Build both the base and jupyterlab image
+
+build-images-no-cache: build-base-image-no-cache build-jupyter-image-no-cache		## Build both the base and jupyterlab image without using the docker cache
+
+build-base-image:		## Build the base image for the 'vanilla' workspace (default), or the workspace specified by setting the argument, IMAGE_NAME=<image_name>
+	@cd base_images/${IMAGE_NAME}; \
+	pwd; \
+	docker buildx build --platform linux/amd64 --progress=plain $(RUN_OPTIONS) -t ${BASE_IMAGE_NAME} -f docker/Dockerfile .
+
+build-base-image-no-cache: RUN_OPTIONS = "--no-cache"
+build-base-image-no-cache: build-base-image
+
+build-jupyter-image:		## Build the jupyter image for the 'vanilla' workspace (default), or the workspace specified by setting the argument, IMAGE_NAME=<image_name>
+	@cd jupyterlab3; \
+	pwd; \
+	docker buildx build --platform linux/amd64 --progress=plain $(RUN_OPTIONS) -t ${JUPYTER_IMAGE_NAME} --build-arg BASE_IMAGE_TYPE=${IMAGE_NAME} --build-arg BASE_IMAGE=${BASE_IMAGE_NAME} -f docker/Dockerfile .
+
+build-jupyter-image-no-cache: RUN_OPTIONS = "--no-cache"
+build-jupyter-image-no-cache: build-jupyter-image
+
+delete-image: delete-base-image delete-jupyter-image	## Delete the base and jupyter image for the 'vanilla' workspace (default), or the workspace specified by setting the argument, IMAGE_NAME=<image_name>
+
+delete-base-image:		## Delete the base image for the 'vanilla' workspace (default), or the workspace specified by setting the argument, IMAGE_NAME=<image_name>
+	docker image rm ${BASE_IMAGE_NAME}
+
+delete-jupyter-image:		## Delete the jupyter image for the 'vanilla' workspace (default), or the workspace specified by setting the argument, IMAGE_NAME=<image_name>
+	docker image rm ${JUPYTER_IMAGE_NAME}
+
+open-jupyter:		## Open a browser window to access an already running instance of a 'vanilla' jupyter image, or the workspace specified by setting the argument, IMAGE_NAME=<image_name>
+	open http://localhost:3100/
+
+start-jupyter:		## Start the jupyter image for the 'vanilla' workspace (default), or the workspace specified by setting the argument, IMAGE_NAME=<image_name>
+	docker run -p 3100:3100 ${JUPYTER_IMAGE_NAME}
+
+# ----------------------------------------------------------------------------
+# Self-Documented Makefile
+# ref: http://marmelab.com/blog/2016/02/29/auto-documented-makefile.html
+# ----------------------------------------------------------------------------
+help:						## (DEFAULT) This help information
+	@echo ====================================================================
+	@grep -E '^## .*$$'  \
+		$(MAKEFILE_LIST)  \
+		| awk 'BEGIN { FS="## " }; {printf "\033[33m%-30s\033[0m \n", $$2}'
+	@echo
+	@grep -E '^[0-9a-zA-Z_-]+:.*?## .*$$'  \
+		$(MAKEFILE_LIST)  \
+		| awk 'BEGIN { FS=":.*?## " }; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'  \
+#		 | sort
+.PHONY: help
+.DEFAULT_GOAL := help

base_images/build-image.sh

@@ -4,7 +4,7 @@ set -ex
 base_image_dir=$(dirname $0)
 # Check if on a branch or in a detached HEAD state get commit sha
 BRANCH=$(basename $(git symbolic-ref -q --short HEAD || git rev-parse --short HEAD))
-DIRS="vanilla r rgedi rsgislib"
+DIRS="vanilla isce3 pangeo r"
 if [[ ! -z "$@" ]]; then
     DIRS=$@
 fi

base_images/isce3/docker/Dockerfile

@@ -1,32 +1,31 @@
-FROM continuumio/miniconda3:22.11.1
+FROM continuumio/miniconda3:23.10.0-1
 ENV LANG en_US.UTF-8
 ENV TZ US/Pacific
 ARG DEBIAN_FRONTEND=noninteractive
 
-# install maap-py library
-ENV MAAP_CONF='/maap-py/'
-RUN git clone --single-branch --branch v3.0.1 https://github.com/MAAP-Project/maap-py.git \
-    && cd maap-py \
-    && pip install -e .
-
-RUN set -ex \
- && apt-get update
+#RUN set -ex \
+# && apt-get update
 
 RUN mkdir /projects
 WORKDIR /projects
 RUN sed -i -e 's/\/root/\/projects/g' /etc/passwd
 
-RUN conda install -y -c conda-forge pyOpenSSL=23.2.0 && \
-    conda install -y -n base conda-libmamba-solver && \
-    conda config --set solver libmamba
+COPY ./environment.yml /tmp
+RUN conda env create -y -f "/tmp/environment.yml" \
+    && 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
+
+# Set the conda environment for all subsequent docker RUN commands
+# When maap-py is updated and installed via our environment.yml,
+# we won't need this line unless other envrionment specific commands are added
+SHELL ["conda", "run", "-n", "isce3", "/bin/bash", "-c"]
 
-RUN conda install -y --solver=libmamba -c conda-forge isce3=0.12.0 xarray=2023.4.2 \
-    hvplot=0.8.3 fsspec=2023.5.0 scikit-learn=1.2.2 && \
-    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
+RUN mkdir /maap-py \
+    && git clone --single-branch --branch v3.1.4 https://github.com/MAAP-Project/maap-py.git /maap-py/ \
+    && pip install -e /maap-py/
 
-RUN pip install git+https://github.com/opera-adt/[email protected]
+RUN conda list
 
 ARG IMAGE_REF
 ENV DOCKERIMAGE_PATH=${IMAGE_REF}

base_images/isce3/environment.yml

@@ -0,0 +1,53 @@
+name: isce3
+channels:
+  - conda-forge
+  - nodefaults
+dependencies:
+  - awscli=2.14.1
+  - backoff=2.2.1
+  - boto3=1.34.3
+  - cython=3.0.7
+  - earthengine-api=0.1.384
+  - fsspec=2023.12.2
+  - gdal=3.7.0
+  - geopandas=0.14.1
+  - groff=1.22.4
+  - h5py=3.9.0
+  - hdf5=1.14.1
+  - httpx=0.25.2
+  - hvplot=0.9.0
+  - isce3=0.14.0
+  - mapclassify=2.6.1
+  - matplotlib=3.8.2
+  - mpl-scatter-density=0.7
+  - numba=0.58.1
+  - numpy=1.26.2
+  - pandas=2.1.4
+  - pycurl=7.45.1
+  - pygeos=0.14
+  - pyogrio=0.6.0
+  - pyproj=3.6.1
+  - pystac-client=0.7.5
+  - python=3.10.13
+  - rasterio=1.3.8
+  - rasterstats=0.19.0
+  - requests=2.31.0
+  - rio-cogeo=5.1.0
+  - rtree=1.1.0
+  - s3fs=2023.12.2
+  - scikit-learn=1.3.2
+  - scipy=1.11.4
+  - seaborn=0.13.0
+  - shapely=2.0.1
+  - sliderule=4.1.0
+  - statsmodels=0.14.1
+  - tqdm=4.66.1
+  - unidecode=1.3.7
+  - xmltodict=0.13.0
+  - xarray=2023.12.0
+  - pip=23.3.2
+  - pip:
+    - git+https://github.com/opera-adt/[email protected]
+    - rio-tiler==6.2.8
+variables:
+  MAAP_CONF: '/maap-py/'

base_images/pangeo/docker/Dockerfile

@@ -1,27 +1,29 @@
-FROM continuumio/miniconda3:22.11.1
+FROM continuumio/miniconda3:23.10.0-1
 ENV LANG en_US.UTF-8
 ENV TZ US/Pacific
 ARG DEBIAN_FRONTEND=noninteractive
 
-# install maap-py library
-ENV MAAP_CONF='/maap-py/'
-RUN git clone --single-branch --branch v3.0.1 https://github.com/MAAP-Project/maap-py.git \
-    && cd maap-py \
-    && pip install -e .
-
 RUN mkdir /projects
 WORKDIR /projects
 RUN sed -i -e 's/\/root/\/projects/g' /etc/passwd
 
-RUN conda install -y -c conda-forge pyOpenSSL=23.2.0 && \
-    conda install -y -n base conda-libmamba-solver && \
-    conda config --set solver libmamba
-
-RUN conda install -y --solver=libmamba -c conda-forge 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 \
+COPY ./environment.yml /tmp
+RUN conda env create -y -f "/tmp/environment.yml" \
     && 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
 
+# Set the conda environment for all subsequent docker RUN commands
+# When maap-py is updated and installed via our environment.yml,
+# we won't need this line unless other envrionment specific commands are added
+SHELL ["conda", "run", "-n", "pangeo", "/bin/bash", "-c"]
+
+# Install maap-py library
+RUN mkdir /maap-py \
+    && git clone --single-branch --branch v3.1.4 https://github.com/MAAP-Project/maap-py.git /maap-py/ \
+    && pip install -e /maap-py/
+
+RUN conda list
+
 ARG IMAGE_REF
 ENV DOCKERIMAGE_PATH=${IMAGE_REF}

base_images/pangeo/environment.yml

@@ -0,0 +1,122 @@
+name: pangeo
+channels:
+  - conda-forge
+  - nodefaults
+dependencies:
+  - awscli=2.14.1
+  - backoff=2.2.1
+  - basemap=1.3.7
+  - bokeh=3.3.3
+  - boto3=1.33.13
+  - bottleneck=1.3.7
+  - cartopy=0.22.0
+  - cdsapi=0.6.1
+  - cf_xarray=0.9.0
+  - cfgrib=0.9.10.4
+  - cython=3.0.7
+  - dask-ml=2023.3.24
+  - datashader=0.16.0
+  - descartes=1.1.0
+  - earthaccess=0.8.2
+  - earthengine-api=0.1.384
+  - eofs=1.4.0
+  - erddapy=2.2.0
+  - esmpy=8.4.2
+  - fastjmd95=0.2.1
+  - flox=0.8.6
+  - fsspec=2023.12.2
+  - gcm_filters=0.3.0
+  - gdal=3.7.0
+  - geocube=0.4.2
+  - geogif=0.1.5
+  - geopandas=0.14.2
+  - geopy=2.4.1
+  - geoviews-core=1.11.0
+  - groff=1.22.4
+  - h5netcdf=1.3.0
+  - h5py=3.9.0
+  - hdf5=1.14.0
+  - holoviews=1.18.1
+  - httpx=0.26.0
+  - hvplot=0.9.1
+  - intake-esm=2024.2.6
+  - intake-geopandas=0.4.0
+  - intake-stac=0.4.0
+  - intake-xarray=0.7.0
+  - intake=0.7.0
+  - kerchunk=0.2.2
+  - line_profiler=4.1.1
+  - lxml=4.9.3
+  - lz4=4.3.2
+  - mapclassify=2.6.1
+  - matplotlib=3.7.3
+  - memory_profiler=0.61.0
+  - metpy=1.6.1
+  - mizani=0.10.0
+  - mpl-scatter-density=0.7
+  - nc-time-axis=1.4.1
+  - netcdf4=1.6.4
+  - numba=0.58.1
+  - numbagg=0.8.0
+  - numcodecs=0.11.0
+  - numpy=1.26.3
+  - odc-stac=0.3.8
+  - pandarallel=1.6.5
+  - pandas=2.1.4
+  - pyarrow=14.0.1
+  - pycamhd=0.7.0
+  - pycurl=7.45.1
+  - pydap=3.4.0
+  - pygeos=0.14
+  - pyogrio=0.6.0
+  - pyproj=3.5.0
+  - pystac-client=0.6.1
+  - pystac=1.9.0
+  - python-blosc=1.10.6
+  - python=3.10.13
+  - rasterio=1.3.7
+  - rasterstats=0.19.0
+  - rechunker=0.5.2
+  - requests=2.31.0
+  - rio-cogeo=5.1.1
+  - rioxarray=0.15.0
+  - rtree=1.1.0
+  - s3fs=2023.12.2
+  - satpy=0.47.0
+  - scikit-image=0.22.0
+  - scikit-learn=1.3.2
+  - scipy=1.11.4
+  - seaborn=0.13.1
+  - shapely=2.0.1
+  - sliderule=4.1.0
+  - sparse=0.15.0
+  - stackstac=0.5.0
+  - statsmodels=0.14.1
+  - tiledb-py=0.19.1 
+  - timezonefinder=6.4.1
+  - tqdm=4.66.1
+  - unidecode=1.3.7
+  - xarray-datatree=0.0.13
+  - xarray-spatial=0.3.5
+  - xarray=2023.12.0
+  - xarrayutils=2.0.0
+  - xbatcher=0.3.0
+  - xcape=0.1.4
+  - xclim=0.46.0
+  - xcube=0.9.1
+  - xesmf=0.8.2
+  - xgboost=2.0.3
+  - xgcm=0.8.1
+  - xhistogram=0.3.2
+  - xmip=0.7.2
+  - xmitgcm=0.5.2
+  - xmltodict=0.13.0
+  - xpublish=0.3.3
+  - xrft=1.0.1
+  - zarr=2.16.1
+  - pip=23.3.2
+  - pip:
+    - morecantile==5.1.0
+    - rio-tiler==6.2.8
+variables:
+  MAAP_CONF: '/maap-py/'