From c9820344b0d5de31c57c8f57371288c0da568f43 Mon Sep 17 00:00:00 2001
From: Charles-William Cummings <cwcummings1@gmail.com>
Date: Tue, 30 Mar 2021 17:01:15 -0400
Subject: [PATCH 01/14] custom notebooks are added to the image

---
 README.md                       |  3 +++
 eo/CHANGELOG.md                 | 12 +++++++++
 eo/Dockerfile                   |  4 +++
 eo/environment.yml              |  3 +++
 eo/notebooks/eo_example.ipynb   | 44 +++++++++++++++++++++++++++++++++
 nlp/CHANGELOG.md                | 11 +++++++++
 nlp/Dockerfile                  |  4 +++
 nlp/notebooks/nlp_example.ipynb | 44 +++++++++++++++++++++++++++++++++
 8 files changed, 125 insertions(+)
 create mode 100644 eo/notebooks/eo_example.ipynb
 create mode 100644 nlp/notebooks/nlp_example.ipynb

diff --git a/README.md b/README.md
index 31922c1..476e0cc 100644
--- a/README.md
+++ b/README.md
@@ -13,3 +13,6 @@ These images were first initialized with the packages listed on this
 The Docker image builds can be found on Docker Hub : 
 * [eo](https://hub.docker.com/repository/docker/pavics/crim-jupyter-eo)
 * [nlp](https://hub.docker.com/repository/docker/pavics/crim-jupyter-nlp)
+
+Each Docker image will include a copy of its associated notebooks found on this repo.
+The image specific notebooks will be found together with the notebooks already included with the 'base' image.
diff --git a/eo/CHANGELOG.md b/eo/CHANGELOG.md
index 1f56514..f34a3b2 100644
--- a/eo/CHANGELOG.md
+++ b/eo/CHANGELOG.md
@@ -12,6 +12,18 @@ Fixes:
 ------
 - ...
 
+0.2.0 (2021-03-30)
+===================
+
+Changes:
+--------
+- Custom notebooks specific to the environment can now be added to the docker image
+- New packages added to environment (rasterio, intake-stac, sat-search)
+
+Fixes:
+------
+- na
+
 0.1.0 (2021-02-22)
 ===================
 
diff --git a/eo/Dockerfile b/eo/Dockerfile
index 8ce9b54..ac4b5c6 100644
--- a/eo/Dockerfile
+++ b/eo/Dockerfile
@@ -17,3 +17,7 @@ ENV CPL_ZIP_ENCODING=UTF-8
 
 # specify user because of problem running start-notebook.sh when being root
 USER jenkins
+
+# Add a copy of the eo notebooks to the docker image
+# All tutorial-notebooks are set with jenkins as owner, so they can be manipulated by jenkins in the docker entrypoint
+COPY --chown=jenkins notebooks/ /notebook_dir/tutorial-notebooks
\ No newline at end of file
diff --git a/eo/environment.yml b/eo/environment.yml
index 70a6137..3919151 100644
--- a/eo/environment.yml
+++ b/eo/environment.yml
@@ -6,7 +6,10 @@ dependencies:
   - affine
   - gdal
   - geojson
+  - intake-stac
   - pyproj
+  - rasterio
+  - sat-search
   - shapely
 
   # TODO: These next packages could possibly be added to a more generic 'vision' image, from which 'eo' would be built
diff --git a/eo/notebooks/eo_example.ipynb b/eo/notebooks/eo_example.ipynb
new file mode 100644
index 0000000..f156973
--- /dev/null
+++ b/eo/notebooks/eo_example.ipynb
@@ -0,0 +1,44 @@
+{
+ "cells": [
+  {
+   "cell_type": "markdown",
+   "id": "framed-intranet",
+   "metadata": {},
+   "source": [
+    "## Example notebook\n",
+    "\n",
+    "This is an example notebook just for the image's first version. \n",
+    "It is used for now to test the integration of the tutorial notebooks in JupyterHub, depending of which environment is selected. Additional notebooks should be added in the future."
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "imposed-serve",
+   "metadata": {},
+   "outputs": [],
+   "source": []
+  }
+ ],
+ "metadata": {
+  "kernelspec": {
+   "display_name": "Python 3",
+   "language": "python",
+   "name": "python3"
+  },
+  "language_info": {
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 3
+   },
+   "file_extension": ".py",
+   "mimetype": "text/x-python",
+   "name": "python",
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython3",
+   "version": "3.8.5"
+  }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 5
+}
diff --git a/nlp/CHANGELOG.md b/nlp/CHANGELOG.md
index 1f56514..a29b8bd 100644
--- a/nlp/CHANGELOG.md
+++ b/nlp/CHANGELOG.md
@@ -12,6 +12,17 @@ Fixes:
 ------
 - ...
 
+0.2.0 (2021-03-30)
+===================
+
+Changes:
+--------
+- Custom notebooks specific to the environment can now be added to the docker image
+
+Fixes:
+------
+- na
+
 0.1.0 (2021-02-22)
 ===================
 
diff --git a/nlp/Dockerfile b/nlp/Dockerfile
index 4cc3cf5..8b76103 100644
--- a/nlp/Dockerfile
+++ b/nlp/Dockerfile
@@ -11,3 +11,7 @@ RUN umask 0000 && conda env update -f /environment.yml
 
 # specify user because of problem running start-notebook.sh when being root
 USER jenkins
+
+# Add a copy of the nlp notebooks to the docker image
+# All tutorial-notebooks are set with jenkins as owner, so they can be manipulated by jenkins in the docker entrypoint
+COPY --chown=jenkins notebooks/ /notebook_dir/tutorial-notebooks
diff --git a/nlp/notebooks/nlp_example.ipynb b/nlp/notebooks/nlp_example.ipynb
new file mode 100644
index 0000000..f156973
--- /dev/null
+++ b/nlp/notebooks/nlp_example.ipynb
@@ -0,0 +1,44 @@
+{
+ "cells": [
+  {
+   "cell_type": "markdown",
+   "id": "framed-intranet",
+   "metadata": {},
+   "source": [
+    "## Example notebook\n",
+    "\n",
+    "This is an example notebook just for the image's first version. \n",
+    "It is used for now to test the integration of the tutorial notebooks in JupyterHub, depending of which environment is selected. Additional notebooks should be added in the future."
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "imposed-serve",
+   "metadata": {},
+   "outputs": [],
+   "source": []
+  }
+ ],
+ "metadata": {
+  "kernelspec": {
+   "display_name": "Python 3",
+   "language": "python",
+   "name": "python3"
+  },
+  "language_info": {
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 3
+   },
+   "file_extension": ".py",
+   "mimetype": "text/x-python",
+   "name": "python",
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython3",
+   "version": "3.8.5"
+  }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 5
+}

From 8fb6d48617df87019c87eda66446511b5bf11504 Mon Sep 17 00:00:00 2001
From: Charles-William Cummings <cwcummings1@gmail.com>
Date: Mon, 12 Apr 2021 16:48:11 -0400
Subject: [PATCH 02/14] added new config file for notebook deployment

---
 eo/Dockerfile                   |  6 ++----
 eo/notebook_config.yml.template | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 eo/notebook_config.yml.template

diff --git a/eo/Dockerfile b/eo/Dockerfile
index ac4b5c6..64ca257 100644
--- a/eo/Dockerfile
+++ b/eo/Dockerfile
@@ -15,9 +15,7 @@ RUN umask 0000 && conda env update -f /environment.yml
 # (https://github.com/conda-forge/gdal-feedstock/issues/83#issue-162911573)
 ENV CPL_ZIP_ENCODING=UTF-8
 
+COPY notebook_config.yml.template /notebook_config.yml.template
+
 # specify user because of problem running start-notebook.sh when being root
 USER jenkins
-
-# Add a copy of the eo notebooks to the docker image
-# All tutorial-notebooks are set with jenkins as owner, so they can be manipulated by jenkins in the docker entrypoint
-COPY --chown=jenkins notebooks/ /notebook_dir/tutorial-notebooks
\ No newline at end of file
diff --git a/eo/notebook_config.yml.template b/eo/notebook_config.yml.template
new file mode 100644
index 0000000..402579b
--- /dev/null
+++ b/eo/notebook_config.yml.template
@@ -0,0 +1,14 @@
+# Config file containing the list of notebooks to download for a specific image.
+#
+# Used in the download script from birdhouse-deploy.
+#
+
+- repo_url: https://github.com/crim-ca/pavics-jupyter-images
+  branch: custom-tutorial-notebooks
+  source_path: eo/notebooks
+  dest_dir: ${JUPYTERHUB_USER_DATA_DIR}/tutorial-notebooks/eo
+
+- repo_url: https://github.com/crim-ca/pavics-jupyter-images
+  branch: custom-tutorial-notebooks
+  source_path: eo/notebooks
+  dest_dir: ${JUPYTERHUB_USER_DATA_DIR}/tutorial-notebooks/eo2

From 3553e9f495b31d7e053ad2a207b2eca9a0107b4c Mon Sep 17 00:00:00 2001
From: Charles-William Cummings <cwcummings1@gmail.com>
Date: Tue, 13 Apr 2021 16:19:52 -0400
Subject: [PATCH 03/14] add config to nlp image

---
 eo/notebook_config.yml.template  | 7 +------
 nlp/Dockerfile                   | 5 ++---
 nlp/notebook_config.yml.template | 9 +++++++++
 3 files changed, 12 insertions(+), 9 deletions(-)
 create mode 100644 nlp/notebook_config.yml.template

diff --git a/eo/notebook_config.yml.template b/eo/notebook_config.yml.template
index 402579b..50e355d 100644
--- a/eo/notebook_config.yml.template
+++ b/eo/notebook_config.yml.template
@@ -6,9 +6,4 @@
 - repo_url: https://github.com/crim-ca/pavics-jupyter-images
   branch: custom-tutorial-notebooks
   source_path: eo/notebooks
-  dest_dir: ${JUPYTERHUB_USER_DATA_DIR}/tutorial-notebooks/eo
-
-- repo_url: https://github.com/crim-ca/pavics-jupyter-images
-  branch: custom-tutorial-notebooks
-  source_path: eo/notebooks
-  dest_dir: ${JUPYTERHUB_USER_DATA_DIR}/tutorial-notebooks/eo2
+  dest_dir: ${JUPYTERHUB_USER_DATA_DIR}/tutorial-notebooks/eo-crim
diff --git a/nlp/Dockerfile b/nlp/Dockerfile
index 8b76103..659ae26 100644
--- a/nlp/Dockerfile
+++ b/nlp/Dockerfile
@@ -9,9 +9,8 @@ COPY environment.yml /environment.yml
 # use umask 0000 so that package files for the updated environment are usable by the user for the jupyter-conda-extension
 RUN umask 0000 && conda env update -f /environment.yml
 
+COPY notebook_config.yml.template /notebook_config.yml.template
+
 # specify user because of problem running start-notebook.sh when being root
 USER jenkins
 
-# Add a copy of the nlp notebooks to the docker image
-# All tutorial-notebooks are set with jenkins as owner, so they can be manipulated by jenkins in the docker entrypoint
-COPY --chown=jenkins notebooks/ /notebook_dir/tutorial-notebooks
diff --git a/nlp/notebook_config.yml.template b/nlp/notebook_config.yml.template
new file mode 100644
index 0000000..e7f2ad2
--- /dev/null
+++ b/nlp/notebook_config.yml.template
@@ -0,0 +1,9 @@
+# Config file containing the list of notebooks to download for a specific image.
+#
+# Used in the download script from birdhouse-deploy.
+#
+
+- repo_url: https://github.com/crim-ca/pavics-jupyter-images
+  branch: custom-tutorial-notebooks
+  source_path: nlp/notebooks
+  dest_dir: ${JUPYTERHUB_USER_DATA_DIR}/tutorial-notebooks/nlp-crim

From f5d8561354847b371ba15a718529a5693094f0ac Mon Sep 17 00:00:00 2001
From: Charles-William Cummings <cwcummings1@gmail.com>
Date: Mon, 19 Apr 2021 15:19:12 -0400
Subject: [PATCH 04/14] update doc

---
 README.md                        | 9 +++++++--
 eo/notebook_config.yml.template  | 7 ++++---
 nlp/notebook_config.yml.template | 7 ++++---
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 476e0cc..a1513c7 100644
--- a/README.md
+++ b/README.md
@@ -14,5 +14,10 @@ The Docker image builds can be found on Docker Hub :
 * [eo](https://hub.docker.com/repository/docker/pavics/crim-jupyter-eo)
 * [nlp](https://hub.docker.com/repository/docker/pavics/crim-jupyter-nlp)
 
-Each Docker image will include a copy of its associated notebooks found on this repo.
-The image specific notebooks will be found together with the notebooks already included with the 'base' image.
+The notebooks associated to each specific image are found on this repo, on their corresponding notebook subfolder. 
+
+Also, a yaml configuration file can be found for each image, containing a list of parameters used 
+by the [deploy-data-specific-image script](https://github.com/bird-house/birdhouse-deploy/blob/master/birdhouse/deployment/deploy-data-specific-image)
+on the [birdhouse-deploy repo](https://github.com/bird-house/birdhouse-deploy). 
+This script is used to download and update the image's associated notebooks that should be available on 
+the JupyterLab environment for DACCS.
diff --git a/eo/notebook_config.yml.template b/eo/notebook_config.yml.template
index 50e355d..7adfb60 100644
--- a/eo/notebook_config.yml.template
+++ b/eo/notebook_config.yml.template
@@ -1,9 +1,10 @@
 # Config file containing the list of notebooks to download for a specific image.
 #
-# Used in the download script from birdhouse-deploy.
-#
+# Used in the deploy-data-specific-image script from birdhouse-deploy.
+# More details on this config can be found on this script file :
+#   https://github.com/bird-house/birdhouse-deploy/blob/master/birdhouse/deployment/deploy-data-specific-image
 
 - repo_url: https://github.com/crim-ca/pavics-jupyter-images
-  branch: custom-tutorial-notebooks
+  branch: master
   source_path: eo/notebooks
   dest_dir: ${JUPYTERHUB_USER_DATA_DIR}/tutorial-notebooks/eo-crim
diff --git a/nlp/notebook_config.yml.template b/nlp/notebook_config.yml.template
index e7f2ad2..3f023b9 100644
--- a/nlp/notebook_config.yml.template
+++ b/nlp/notebook_config.yml.template
@@ -1,9 +1,10 @@
 # Config file containing the list of notebooks to download for a specific image.
 #
-# Used in the download script from birdhouse-deploy.
-#
+# Used in the deploy-data-specific-image script from birdhouse-deploy.
+# More details on this config can be found on this script file :
+#   https://github.com/bird-house/birdhouse-deploy/blob/master/birdhouse/deployment/deploy-data-specific-image
 
 - repo_url: https://github.com/crim-ca/pavics-jupyter-images
-  branch: custom-tutorial-notebooks
+  branch: master
   source_path: nlp/notebooks
   dest_dir: ${JUPYTERHUB_USER_DATA_DIR}/tutorial-notebooks/nlp-crim

From 0e68050163d698985c059f01a9072db536fcccba Mon Sep 17 00:00:00 2001
From: Charles-William Cummings <cwcummings1@gmail.com>
Date: Wed, 21 Apr 2021 15:01:25 -0400
Subject: [PATCH 05/14] remove dest_dir config parameter and remove template
 suffix

---
 eo/Dockerfile                                             | 2 +-
 eo/{notebook_config.yml.template => notebook_config.yml}  | 1 -
 nlp/Dockerfile                                            | 2 +-
 nlp/{notebook_config.yml.template => notebook_config.yml} | 1 -
 4 files changed, 2 insertions(+), 4 deletions(-)
 rename eo/{notebook_config.yml.template => notebook_config.yml} (86%)
 rename nlp/{notebook_config.yml.template => notebook_config.yml} (86%)

diff --git a/eo/Dockerfile b/eo/Dockerfile
index 64ca257..2d5cd97 100644
--- a/eo/Dockerfile
+++ b/eo/Dockerfile
@@ -15,7 +15,7 @@ RUN umask 0000 && conda env update -f /environment.yml
 # (https://github.com/conda-forge/gdal-feedstock/issues/83#issue-162911573)
 ENV CPL_ZIP_ENCODING=UTF-8
 
-COPY notebook_config.yml.template /notebook_config.yml.template
+COPY notebook_config.yml /notebook_config.yml
 
 # specify user because of problem running start-notebook.sh when being root
 USER jenkins
diff --git a/eo/notebook_config.yml.template b/eo/notebook_config.yml
similarity index 86%
rename from eo/notebook_config.yml.template
rename to eo/notebook_config.yml
index 7adfb60..64338d8 100644
--- a/eo/notebook_config.yml.template
+++ b/eo/notebook_config.yml
@@ -7,4 +7,3 @@
 - repo_url: https://github.com/crim-ca/pavics-jupyter-images
   branch: master
   source_path: eo/notebooks
-  dest_dir: ${JUPYTERHUB_USER_DATA_DIR}/tutorial-notebooks/eo-crim
diff --git a/nlp/Dockerfile b/nlp/Dockerfile
index 659ae26..c7ea96d 100644
--- a/nlp/Dockerfile
+++ b/nlp/Dockerfile
@@ -9,7 +9,7 @@ COPY environment.yml /environment.yml
 # use umask 0000 so that package files for the updated environment are usable by the user for the jupyter-conda-extension
 RUN umask 0000 && conda env update -f /environment.yml
 
-COPY notebook_config.yml.template /notebook_config.yml.template
+COPY notebook_config.yml /notebook_config.yml
 
 # specify user because of problem running start-notebook.sh when being root
 USER jenkins
diff --git a/nlp/notebook_config.yml.template b/nlp/notebook_config.yml
similarity index 86%
rename from nlp/notebook_config.yml.template
rename to nlp/notebook_config.yml
index 3f023b9..d9ec881 100644
--- a/nlp/notebook_config.yml.template
+++ b/nlp/notebook_config.yml
@@ -7,4 +7,3 @@
 - repo_url: https://github.com/crim-ca/pavics-jupyter-images
   branch: master
   source_path: nlp/notebooks
-  dest_dir: ${JUPYTERHUB_USER_DATA_DIR}/tutorial-notebooks/nlp-crim

From 9efeda78618f27a34282bd9957fe1fdd549c4886 Mon Sep 17 00:00:00 2001
From: Charles-William Cummings <cwcummings1@gmail.com>
Date: Fri, 23 Apr 2021 14:38:00 -0400
Subject: [PATCH 06/14] update readme

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index a1513c7..aee8143 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ The Docker image builds can be found on Docker Hub :
 The notebooks associated to each specific image are found on this repo, on their corresponding notebook subfolder. 
 
 Also, a yaml configuration file can be found for each image, containing a list of parameters used 
-by the [deploy-data-specific-image script](https://github.com/bird-house/birdhouse-deploy/blob/master/birdhouse/deployment/deploy-data-specific-image)
-on the [birdhouse-deploy repo](https://github.com/bird-house/birdhouse-deploy). 
+by the [deploy-data-specific-image script](https://github.com/bird-house/pavics-jupyter-base/blob/master/scheduler-jobs/deploy-data-specific-image)
+on the [bird-house/pavics-jupyter-base repo](https://github.com/bird-house/pavics-jupyter-base). 
 This script is used to download and update the image's associated notebooks that should be available on 
 the JupyterLab environment for DACCS.

From 9aaccb238fc7f4f18828775309293af73673a726 Mon Sep 17 00:00:00 2001
From: Charles-William Cummings <cwcummings1@gmail.com>
Date: Fri, 23 Apr 2021 14:39:39 -0400
Subject: [PATCH 07/14] fix README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index aee8143..3f475f3 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ The Docker image builds can be found on Docker Hub :
 The notebooks associated to each specific image are found on this repo, on their corresponding notebook subfolder. 
 
 Also, a yaml configuration file can be found for each image, containing a list of parameters used 
-by the [deploy-data-specific-image script](https://github.com/bird-house/pavics-jupyter-base/blob/master/scheduler-jobs/deploy-data-specific-image)
+by the [deploy_data_specific_image script](https://github.com/bird-house/pavics-jupyter-base/blob/master/scheduler-jobs/deploy_data_specific_image)
 on the [bird-house/pavics-jupyter-base repo](https://github.com/bird-house/pavics-jupyter-base). 
 This script is used to download and update the image's associated notebooks that should be available on 
 the JupyterLab environment for DACCS.

From 2cd4f387e888d945114052b3b117aaed1c2f0f8a Mon Sep 17 00:00:00 2001
From: Charles-William Cummings <cwcummings1@gmail.com>
Date: Fri, 23 Apr 2021 15:05:24 -0400
Subject: [PATCH 08/14] test notebook update

---
 nlp/notebooks/nlp_example.ipynb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nlp/notebooks/nlp_example.ipynb b/nlp/notebooks/nlp_example.ipynb
index f156973..b679cdd 100644
--- a/nlp/notebooks/nlp_example.ipynb
+++ b/nlp/notebooks/nlp_example.ipynb
@@ -7,7 +7,7 @@
    "source": [
     "## Example notebook\n",
     "\n",
-    "This is an example notebook just for the image's first version. \n",
+    "- This is an example notebook just for the image's first version. \n",
     "It is used for now to test the integration of the tutorial notebooks in JupyterHub, depending of which environment is selected. Additional notebooks should be added in the future."
    ]
   },

From fa208b3e1b8fd05694566b4ab4bc4b944a881819 Mon Sep 17 00:00:00 2001
From: Charles-William Cummings <cwcummings1@gmail.com>
Date: Tue, 4 May 2021 13:05:42 -0400
Subject: [PATCH 09/14] add dest_sub_dir parameter in config

---
 eo/notebook_config.yml  | 5 +++--
 nlp/notebook_config.yml | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/eo/notebook_config.yml b/eo/notebook_config.yml
index 64338d8..530f76b 100644
--- a/eo/notebook_config.yml
+++ b/eo/notebook_config.yml
@@ -1,9 +1,10 @@
 # Config file containing the list of notebooks to download for a specific image.
 #
-# Used in the deploy-data-specific-image script from birdhouse-deploy.
+# Used in the deploy-data-specific-image script from pavics-jupyter-base.
 # More details on this config can be found on this script file :
-#   https://github.com/bird-house/birdhouse-deploy/blob/master/birdhouse/deployment/deploy-data-specific-image
+#   https://github.com/bird-house/pavics-jupyter-base/blob/master/scheduler-jobs/deploy_data_specific_image
 
 - repo_url: https://github.com/crim-ca/pavics-jupyter-images
   branch: master
   source_path: eo/notebooks
+  dest_sub_dir:
diff --git a/nlp/notebook_config.yml b/nlp/notebook_config.yml
index d9ec881..5dd6389 100644
--- a/nlp/notebook_config.yml
+++ b/nlp/notebook_config.yml
@@ -1,9 +1,10 @@
 # Config file containing the list of notebooks to download for a specific image.
 #
-# Used in the deploy-data-specific-image script from birdhouse-deploy.
+# Used in the deploy-data-specific-image script from pavics-jupyter-base.
 # More details on this config can be found on this script file :
-#   https://github.com/bird-house/birdhouse-deploy/blob/master/birdhouse/deployment/deploy-data-specific-image
+#   https://github.com/bird-house/pavics-jupyter-base/blob/master/scheduler-jobs/deploy_data_specific_image
 
 - repo_url: https://github.com/crim-ca/pavics-jupyter-images
   branch: master
   source_path: nlp/notebooks
+  dest_sub_dir:

From a3aa1b462431fd2d26436f80dc95384ee8250c6c Mon Sep 17 00:00:00 2001
From: Charles-William Cummings <cwcummings1@gmail.com>
Date: Wed, 5 May 2021 08:53:24 -0400
Subject: [PATCH 10/14] add common folder to configs

---
 eo/CHANGELOG.md         |  2 +-
 eo/notebook_config.yml  | 11 ++++++++---
 nlp/CHANGELOG.md        |  2 +-
 nlp/notebook_config.yml | 11 ++++++++---
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/eo/CHANGELOG.md b/eo/CHANGELOG.md
index f34a3b2..778f5e9 100644
--- a/eo/CHANGELOG.md
+++ b/eo/CHANGELOG.md
@@ -12,7 +12,7 @@ Fixes:
 ------
 - ...
 
-0.2.0 (2021-03-30)
+0.2.0 (2021-05-05)
 ===================
 
 Changes:
diff --git a/eo/notebook_config.yml b/eo/notebook_config.yml
index 530f76b..0b035ac 100644
--- a/eo/notebook_config.yml
+++ b/eo/notebook_config.yml
@@ -1,4 +1,4 @@
-# Config file containing the list of notebooks to download for a specific image.
+# Config file containing the list of notebooks directories to download for a specific image.
 #
 # Used in the deploy-data-specific-image script from pavics-jupyter-base.
 # More details on this config can be found on this script file :
@@ -6,5 +6,10 @@
 
 - repo_url: https://github.com/crim-ca/pavics-jupyter-images
   branch: master
-  source_path: eo/notebooks
-  dest_sub_dir:
+  source_dir: eo/notebooks
+  dest_sub_dir: eo
+
+- repo_url: https://github.com/Ouranosinc/pavics-sdi
+  branch: master
+  source_dir: docs/source/notebooks
+  dest_sub_dir: common
diff --git a/nlp/CHANGELOG.md b/nlp/CHANGELOG.md
index a29b8bd..48c6169 100644
--- a/nlp/CHANGELOG.md
+++ b/nlp/CHANGELOG.md
@@ -12,7 +12,7 @@ Fixes:
 ------
 - ...
 
-0.2.0 (2021-03-30)
+0.2.0 (2021-05-05)
 ===================
 
 Changes:
diff --git a/nlp/notebook_config.yml b/nlp/notebook_config.yml
index 5dd6389..b30c210 100644
--- a/nlp/notebook_config.yml
+++ b/nlp/notebook_config.yml
@@ -1,4 +1,4 @@
-# Config file containing the list of notebooks to download for a specific image.
+# Config file containing the list of notebooks directories to download for a specific image.
 #
 # Used in the deploy-data-specific-image script from pavics-jupyter-base.
 # More details on this config can be found on this script file :
@@ -6,5 +6,10 @@
 
 - repo_url: https://github.com/crim-ca/pavics-jupyter-images
   branch: master
-  source_path: nlp/notebooks
-  dest_sub_dir:
+  source_dir: nlp/notebooks
+  dest_sub_dir: nlp
+
+- repo_url: https://github.com/Ouranosinc/pavics-sdi
+  branch: master
+  source_dir: docs/source/notebooks
+  dest_sub_dir: common

From 12de0f94694e3c15627d29f5a8850aa26c2711f3 Mon Sep 17 00:00:00 2001
From: Charles-William Cummings <cwcummings1@gmail.com>
Date: Tue, 11 May 2021 12:32:24 -0400
Subject: [PATCH 11/14] bump version dates

---
 eo/CHANGELOG.md  | 2 +-
 nlp/CHANGELOG.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eo/CHANGELOG.md b/eo/CHANGELOG.md
index 778f5e9..c365d7b 100644
--- a/eo/CHANGELOG.md
+++ b/eo/CHANGELOG.md
@@ -12,7 +12,7 @@ Fixes:
 ------
 - ...
 
-0.2.0 (2021-05-05)
+0.2.0 (2021-05-11)
 ===================
 
 Changes:
diff --git a/nlp/CHANGELOG.md b/nlp/CHANGELOG.md
index 48c6169..4a3482f 100644
--- a/nlp/CHANGELOG.md
+++ b/nlp/CHANGELOG.md
@@ -12,7 +12,7 @@ Fixes:
 ------
 - ...
 
-0.2.0 (2021-05-05)
+0.2.0 (2021-05-11)
 ===================
 
 Changes:

From b8c3b08511a9e2d6779cddb19c140a97641edc1b Mon Sep 17 00:00:00 2001
From: Charles-William Cummings <cwcummings1@gmail.com>
Date: Tue, 11 May 2021 12:32:50 -0400
Subject: [PATCH 12/14] fix to avoid dockerhub warning problem

---
 eo/environment.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/eo/environment.yml b/eo/environment.yml
index 3919151..d5afe2c 100644
--- a/eo/environment.yml
+++ b/eo/environment.yml
@@ -30,6 +30,8 @@ dependencies:
   - six
   - tensorboardX
   - tqdm
+  # for pip packages, include even if already in pavics-jupyter-base image, to avoid a warning problem on DockerHub
+  - pip
   - pip:
     # Install kornia from pypi, versions from conda are older and create conflicting errors with latest python version
     - kornia

From 25efbba22e81873481a9b6b2bf5d8e4e3ea48aa8 Mon Sep 17 00:00:00 2001
From: Charles-William Cummings <cwcummings1@gmail.com>
Date: Tue, 11 May 2021 12:41:58 -0400
Subject: [PATCH 13/14] format example notebooks

---
 eo/notebooks/eo_example.ipynb   | 3 ++-
 nlp/notebooks/nlp_example.ipynb | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/eo/notebooks/eo_example.ipynb b/eo/notebooks/eo_example.ipynb
index f156973..5042187 100644
--- a/eo/notebooks/eo_example.ipynb
+++ b/eo/notebooks/eo_example.ipynb
@@ -8,7 +8,8 @@
     "## Example notebook\n",
     "\n",
     "This is an example notebook just for the image's first version. \n",
-    "It is used for now to test the integration of the tutorial notebooks in JupyterHub, depending of which environment is selected. Additional notebooks should be added in the future."
+    "It is used for now to test the integration of the tutorial notebooks in JupyterHub, depending of which environment is selected. \n",
+    "Additional notebooks should be added in the future."
    ]
   },
   {
diff --git a/nlp/notebooks/nlp_example.ipynb b/nlp/notebooks/nlp_example.ipynb
index b679cdd..5042187 100644
--- a/nlp/notebooks/nlp_example.ipynb
+++ b/nlp/notebooks/nlp_example.ipynb
@@ -7,8 +7,9 @@
    "source": [
     "## Example notebook\n",
     "\n",
-    "- This is an example notebook just for the image's first version. \n",
-    "It is used for now to test the integration of the tutorial notebooks in JupyterHub, depending of which environment is selected. Additional notebooks should be added in the future."
+    "This is an example notebook just for the image's first version. \n",
+    "It is used for now to test the integration of the tutorial notebooks in JupyterHub, depending of which environment is selected. \n",
+    "Additional notebooks should be added in the future."
    ]
   },
   {

From 55f4d554e157fc4791e3089f6a339d698ff400be Mon Sep 17 00:00:00 2001
From: Charles-William Cummings <cwcummings1@gmail.com>
Date: Tue, 11 May 2021 12:47:32 -0400
Subject: [PATCH 14/14] use new base version

---
 eo/Dockerfile  | 2 +-
 nlp/Dockerfile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eo/Dockerfile b/eo/Dockerfile
index 2d5cd97..d6a5fc4 100644
--- a/eo/Dockerfile
+++ b/eo/Dockerfile
@@ -1,4 +1,4 @@
-FROM birdhouse/pavics-jupyter-base:0.1.0
+FROM birdhouse/pavics-jupyter-base:0.2.0
 
 # must update conda env as root, because of a permission error when having pip dependencies in the input yml file
 USER root
diff --git a/nlp/Dockerfile b/nlp/Dockerfile
index c7ea96d..f78e8be 100644
--- a/nlp/Dockerfile
+++ b/nlp/Dockerfile
@@ -1,4 +1,4 @@
-FROM birdhouse/pavics-jupyter-base:0.1.0
+FROM birdhouse/pavics-jupyter-base:0.2.0
 
 # must update conda env as root, because of a permission error when having pip dependencies in the input yml file
 USER root