Merge pull request #14 from guimou/dev

Images compatibility with KFNBC
opendatahub-io-contrib · Oct 5, 2022 · 9f33c3f · 9f33c3f
2 parents b5ad86a + 0c3b1a7
commit 9f33c3f
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,8 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-- Monai notebook in the `notebook-controller-images` line. As it's not thoroughly tested it's still not officially released.
+- Nothing
+
+## [0.0.13] - 2022-10-05
+
+- Monai notebook in the `notebook-controller-images` line. As it's not thoroughly tested it's still not officially released
 - OptaPy custom image updated with OptaPy 8.23.0a0, s2i-minimal-data-science-optapy-notebook:v0.0.2
+- All images, including those in the `jupyterhub-images` folder are now compatible with the Kubeflow Notebook Controller
 
 ## [0.0.12] - 2022-08-04
 

diff --git a/README.md b/README.md
@@ -6,5 +6,5 @@ Various custom Jupyter Notebook Images to use with [Open Data Hub](http://openda
 
 Images are organized under two main folders:
 
-* [jupyterhub-images](/jupyterhub-images): those images were created to be used with ODH or RHODS with JupyterHub as the launcher (up to ODH1.3 and RHODS ...)
+* [jupyterhub-images](/jupyterhub-images): those images were created to be used with ODH or RHODS with JupyterHub as the launcher (up to ODH1.3 and RHODS ...). Now compatible with Kubeflow Notebook Controller!
 * [notebook-controller-images](notebook-controller-images): those images were created to be used with ODH or RHODS with the Kubeflow Notebook Controller as the launcher (from ODH1.4 and RHODS ...)
diff --git a/jupyterhub-images/README.md b/jupyterhub-images/README.md
@@ -1,6 +1,6 @@
 # JupyterHub Custom Notebook Images
 
-Those images were created to be used with ODH or RHODS with JupyterHub as the launcher (up to ODH1.3 and RHODS ...)
+Those images were created to be used with ODH or RHODS with JupyterHub as the launcher (up to ODH1.3 and RHODS ...). However, they are now compatible with the new Kubeflow Notebook Controller.
 
 * OptaPy: Minimal JupyterLab notebook including [OptaPy](https://www.optapy.org/optapy/latest/optapy-introduction/optapy-introduction.html), the Python version of OptaPlanner.
 * R: Minimal JupyterLab notebook including [R](https://www.r-project.org/) (4.0.5) and [RStudio](https://www.rstudio.com/products/rstudio/) (2022.02.0).

diff --git a/jupyterhub-images/monai-notebook/container/Dockerfile b/jupyterhub-images/monai-notebook/container/Dockerfile
@@ -259,4 +259,4 @@ RUN jupyter lab build && \
 WORKDIR /opt/app-root/src
 USER 1001
 
-CMD /opt/app-root/bin/start-singleuser.sh --ip=0.0.0.0 --port=8080
+CMD /opt/app-root/bin/start-singleuser.sh --ip=0.0.0.0
diff --git a/jupyterhub-images/optapy-notebook/container/Dockerfile b/jupyterhub-images/optapy-notebook/container/Dockerfile
@@ -19,4 +19,4 @@ RUN micropipenv install --deploy
 WORKDIR /opt/app-root/src
 USER 1001
 
-CMD /opt/app-root/bin/start-singleuser.sh --ip=0.0.0.0 --port=8080
+CMD /opt/app-root/bin/start-singleuser.sh --ip=0.0.0.0
diff --git a/jupyterhub-images/r-notebook/container/Dockerfile b/jupyterhub-images/r-notebook/container/Dockerfile
@@ -55,4 +55,4 @@ WORKDIR /opt/app-root/src
 
 USER 1001
 
-CMD /opt/app-root/bin/start-singleuser.sh --ip=0.0.0.0 --port=8080
+CMD /opt/app-root/bin/start-singleuser.sh --ip=0.0.0.0 
diff --git a/jupyterhub-images/sagemath-notebook/container/Dockerfile b/jupyterhub-images/sagemath-notebook/container/Dockerfile
@@ -41,4 +41,4 @@ RUN sed -i 's/"Python 3 (ipykernel)"/"Python 3.9.10"/g' /opt/app-root/share/jupy
 WORKDIR /opt/app-root/src
 USER 1001
 
-CMD /opt/app-root/bin/start-singleuser.sh --ip=0.0.0.0 --port=8080
+CMD /opt/app-root/bin/start-singleuser.sh --ip=0.0.0.0
diff --git a/jupyterhub-images/streamlit-notebook/container/Dockerfile b/jupyterhub-images/streamlit-notebook/container/Dockerfile
@@ -38,4 +38,4 @@ RUN jupyter lab build && \
 WORKDIR /opt/app-root/src
 USER 1001
 
-CMD /opt/app-root/bin/start-singleuser.sh --ip=0.0.0.0 --port=8080
+CMD /opt/app-root/bin/start-singleuser.sh --ip=0.0.0.0
Original file line number	Diff line number	Diff line change
Expand Up		@@ -55,4 +55,4 @@ WORKDIR /opt/app-root/src

		USER 1001

		CMD /opt/app-root/bin/start-singleuser.sh --ip=0.0.0.0 --port=8080
		CMD /opt/app-root/bin/start-singleuser.sh --ip=0.0.0.0