Resolve merge conflicts

everest-engineering · Nov 23, 2021 · 8aaeefc · 8aaeefc
2 parents be07361 + 044440a
commit 8aaeefc
Show file tree

Hide file tree

Showing 10 changed files with 701 additions and 522 deletions.
diff --git a/doc/notebook/Dockerfile b/doc/notebook/Dockerfile
@@ -1,4 +1,4 @@
-FROM rubydata/datascience-notebook:3df56b9025d3
+FROM jupyter/base-notebook
 
-RUN gem install httpclient rest-client json iruby awesome_print gnuplot rubyvis nyaplot cztop pry pry-doc
+RUN pip install python-keycloak
 
diff --git a/doc/notebook/docker-compose.yml b/doc/notebook/docker-compose.yml
@@ -3,7 +3,10 @@ services:
   notebook:
     build:
       context: .
+    container_name: jupyter-notebook
     volumes:
       - ./files:/home/jovyan/work
-    network_mode: "host"
-
+    network_mode: host
+    environment:
+      - JUPYTER_ENABLE_LAB=yes
+