Move Dockerfile to the repository root

OpenGeoscience · Feb 2, 2017 · bd6c73d · bd6c73d
1 parent 9f19644
commit bd6c73d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/devops/docker/Dockerfile → Dockerfile b/devops/docker/Dockerfile → Dockerfile
@@ -49,15 +49,16 @@ RUN /usr/sbin/jupyter-notebook --generate-config \
     && sed -i s/#c.NotebookApp.token\ \=\ \'\'/c.NotebookApp.token\ \=\ \'\'/g \
            /root/.jupyter/jupyter_notebook_config.py
 
-RUN git clone https://github.com/OpenGeoscience/geonotebook.git /opt/geonotebook \
-    && pushd /opt/geonotebook \
-    && git checkout devops_enable_extension \
-    && pip2 install https://github.com/OpenGeoscience/KTile/archive/master.zip \
+RUN pip2 install https://github.com/OpenGeoscience/KTile/archive/master.zip
+
+ADD . /opt/geonotebook
+ADD devops/docker/jupyter.sh /jupyter.sh
+
+RUN pushd /opt/geonotebook \
     && pip2 install . \
     && jupyter serverextension enable --py geonotebook --sys-prefix \
     && jupyter nbextension enable --py geonotebook --sys-prefix
 
 VOLUME /notebooks
 WORKDIR /notebooks
-ADD jupyter.sh /jupyter.sh
 CMD ../jupyter.sh
diff --git a/devops/docker/README.md b/devops/docker/README.md
@@ -3,7 +3,7 @@
 Geonotebook relies on a complex stack of technologies that are not always easy to install and properly configure. To ease this complexity we provide a docker container for running the notebook on docker compatible systems. To install docker on your system please see docker's [documentation](https://docs.docker.com/engine/installation/) for your operating system.
 
 ## Build the container
-First you must build the docker container.  After checking out the current repository and navigating to ```devops/docker/``` you can run
+First you must build the docker container.  After checking out the current repository, you can run
 
 ```
 docker build -t geonotebook .