Merge pull request #4 from eucp-project/pin_dependencies

Pin dependencies on original docker image

Author: JaroCamphuijsen

Dockerfile

@@ -49,32 +49,32 @@ USER $NB_UID
 # - Downgrade Matplotlib to 2.2 for Iris
 # - pyngl and pynio have incompatible dependencies with some other packages
 RUN conda install --quiet --yes --channel esmvalgroup --channel conda-forge --channel pcmdi/label/nightly --override-channels \
-    'ipyleaflet' \
-    'ipywidgets' \
-    'iris' \
-    'iris-sample-data' \
-    'cftime' \
-    'nc-time-axis' \
-    'h5py' \
-    'netcdf4' \
-    'pyproj' \
-    'cartopy' \
-    'dask' \
-    'xarray' \
-    'boost' \
-    'gdal' \
-    'cdo' \
-    'nco' \
-	'pcraster' \
-	'rasterio' \
-	'zarr' \
-	'imod' \
-    'cdms2' \
-    'eofs' \
-    'esmpy' \
+    'python=3.7.6' \
+    'boost=1.72.0'\
+    'cartopy=0.17.0' \
+    'cdms2=3.1.3' \
+    # 'cdo=1.5.3' \
+    'cftime=1.1.1.2' \
+    'cmor=2019.05.16.master.numpy' \
+    'dask=2.2.0' \
+    'eofs=1.4.0' \
+    'esmpy=8.0.0' \
+    'gdal=3.0.4' \
+    'h5py=2.10.0' \
+    'imod=0.9.0' \
+    'ipyleaflet=0.12.4' \
+    'ipywidgets=7.5.1' \
+    'iris=2.4.0' \
+    'iris-sample-data=2.2.0' \
+    'nc-time-axis=1.2.0' \
+    'nco=4.9.1' \
+    'netcdf4=1.5.3' \
+    'pcraster=4.3.0' \
+    'pyproj=2.6.0' \
+    'rasterio=1.1.3' \
+    'xarray=0.15.1' \
+    'zarr=2.4.0' \
 #    'esmvalcore' \
-    'cmor' \
-    'python=3.7' \
  && conda clean --all -f -y \
  && fix-permissions $CONDA_DIR \
  && fix-permissions /home/$NB_USER

README.md

@@ -4,19 +4,28 @@ Dockerfile for the EUCP project - based on the Jupyter datascience notebook\
 
 ## Branches
 - master: for regular development and updates. Merging via approved pull requests. Linked to 'latest' tag on dockerhub.
-- stable: standard branch for jupyterhub deployment. Linked to the 'stable' tag on dockerhub.
-- feature branches: make a separate branch for each PR/feature that you want to add. 
+- feature branches: make a separate branch for each PR/feature that you want to add.
+
+## Releases
+- We'll configure the login environment such that you can select which release you want to use for your compute environment.
 
 ## Update process
 1. Checkout, build and run the docker image locally
-2. Make desired changes to the environment
-3. Build and run updated docker image locally for testing
-4. Document changes made to the environment in the changelog below
-4. Make a pull request to the master branch of this repository
+1. Make desired changes to the environment
+1. Build and run updated docker image locally for testing
+1. Use `conda list --export > package_list_for_change_diffs.txt`, download and commit the result
+1. Summarize changes made to the environment in the changelog below
+1. Make a pull request to the master branch of this repository
+1. Once the PR is merged, test changed in the 'live' environment by choosing 'latest'.
+1. Consider making a new release and adding it to the ansible setup
 
 ## Changelog
 
-May 18, 2020: 
+May 20, 2020:
+- Pin versions to current environment configuration
+- Add `package_list_for_change_diffs.txt` for keeping track of environment changes.
+
+May 18, 2020:
 - Start changelog
 - Enable autobuild on dockerhub
 - Create master and stable branches