Merge pull request #21 from manics/conda-forge-websockify

yuvipanda · Jul 27, 2020 · d646f37 · d646f37
2 parents 4c3d380 + cb1c549
commit d646f37
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -14,5 +14,6 @@ RUN apt-get -y update \
    xubuntu-icon-theme
 
 USER $NB_USER
-RUN conda install -c manics websockify \ 
- && pip install jupyter-desktop-server
+ADD . /opt/install
+RUN cd /opt/install && \
+   conda env update -n base --file environment.yml
diff --git a/environment.yml b/environment.yml
@@ -1,6 +1,8 @@
 channels:
-  - manics
+  - conda-forge
 dependencies:
+  - jupyter-server-proxy>=1.4
+  - pip
   - websockify
   - pip:
-    - .
+      - .