From 24af6efbcbe85b148ab93836db2ed03d0da5022d Mon Sep 17 00:00:00 2001
From: Charlotte Weaver <charlottesweaver@gmail.com>
Date: Tue, 11 Dec 2018 10:18:10 -0800
Subject: [PATCH] Add Docker file (#505)

* Add docker support

* Add readme

* minor fixes
---
 .dockerignore           |  5 +++++
 .travis.yml             |  1 +
 Dockerfile              | 10 ++++++++++
 README.md               |  9 +++++++++
 server/requirements.txt |  2 +-
 5 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 .dockerignore
 create mode 100644 Dockerfile

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 00000000..a7f3b242
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,5 @@
+bin
+client
+dist
+docs
+server
diff --git a/.travis.yml b/.travis.yml
index 34f583f6..edfdee16 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,6 +11,7 @@ install:
   - ./bin/build-client
   - pip install -e .
   - pip install -r server/requirements-dev.txt
+  - docker build .
 script:
   - set -eo pipefail
   - flake8 server/app/
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 00000000..1e92abde
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,10 @@
+FROM ubuntu:bionic
+
+ENV LC_ALL=C.UTF-8
+ENV LANG=C.UTF-8
+
+RUN apt-get update && \
+    apt-get install -y build-essential libxml2-dev python3-dev python3-pip zlib1g-dev && \
+    pip3 install cellxgene
+
+ENTRYPOINT ["cellxgene"]
\ No newline at end of file
diff --git a/README.md b/README.md
index 6d045fdf..10627d0a 100644
--- a/README.md
+++ b/README.md
@@ -114,6 +114,15 @@ source ${ENV_NAME}/bin/activate
 pip install cellxgene
 ```
 
+## docker
+
+We have included a dockerfile to conveniently run cellxgene from docker. 
+
+1. Build the  image `docker build . -t cellxgene`
+2. Run the container and mount data `docker run -v "$PWD/example-dataset/:/data/" -p 5005:5005 cellxgene launch --host 0.0.0.0 data/pbmc3k.h5ad`
+    * You will need to use --host 0.0.0.0 to have the container listen to incoming requests from the browser
+
+
 ## FAQ
 
 <details>
diff --git a/server/requirements.txt b/server/requirements.txt
index 1b1763f2..448f47d2 100644
--- a/server/requirements.txt
+++ b/server/requirements.txt
@@ -11,4 +11,4 @@ numpy>=1.14.5
 pandas>=0.23.1
 scanpy>=1.3.2
 scipy>=1.1.0
-scikit-learn>=0.20.1
+scikit-learn>=0.19.1,!=0.20.0