Remove ubuntu image from Dockerfile, explicitly install THOR into Python environment, minor clarification tweaks to README.md

Author: moeyensj

Dockerfile

@@ -1,4 +1,3 @@
-FROM ubuntu:latest
 FROM continuumio/miniconda3
 MAINTAINER Joachim Moeyens <moeyensj@gmail.com>
 
@@ -17,7 +16,8 @@ RUN mkdir projects \
 	&& cd projects \
 	&& git clone https://github.com/moeyensj/thor.git --depth=1
 
-# Create Python 3.6 conda environment and install requirements
+# Create Python 3.6 conda environment and install requirements, then install THOR
 RUN cd projects/thor \
 	&& conda install -c defaults -c conda-forge -c astropy --file requirements.txt python=3.6 --y \
-	&& python -m ipykernel install --user --name thor_py36 --display-name "THOR (Python 3.6)"
+	&& python -m ipykernel install --user --name thor_p36 --display-name "THOR (Python 3.6)" \
+	&& python setup.py install

README.md

@@ -13,26 +13,58 @@ Warning: The THOR code is still in very active development.
 
 The corresponding notebook repository can be found at: https://github.com/moeyensj/thor_notebooks
 
+We recommend installing the code along one of two installation paths: either a source code installation, or an installation via docker. 
+
 ### Source
-Clone this repository using either `ssh` or `https`.
+Clone this repository using either `ssh` or `https`. Once cloned and downloaded, `cd` into the repository. 
+
+To install THOR in its own `conda` enviroment please do the following:  
+
+```conda create -n thor_py36 -c defaults -c conda-forge -c astropy --file requirements.txt python=3.6```  
 
-To create a `conda` environment in which to run the code:  
-```conda create -n thor_py36 -c defaults -c conda-forge -c astropy --file requirements.txt python=3.6```
+Or, to install THOR in a pre-existing `conda` environment called `env`:  
 
-To install pre-requisite software into a `conda` enviroment named env:  
 ```conda activate env```  
-```conda install -c defaults -c conda-forge --file requirements.txt```
+```conda install -c defaults -c conda-forge -c astropy --file requirements.txt```  
+
+Or, to install pre-requisite software using `pip`:  
 
-To install pre-requisite software using pip:  
 ```pip install -r requirements.txt```
 
-Once pre-requisites have been installed:  
+Once pre-requisites have been installed using either one of the tree options above, then:  
+
 ```python setup.py install```
 
+You should now be able to start Python and import THOR. 
+```
+┌─(thor_py36)[~]
+└─▪ python
+Python 3.6.9 (default, Jul 30 2019, 19:07:31) 
+[Clang 4.0.1 (tags/RELEASE_401/final)] :: Anaconda, Inc. on darwin
+Type "help", "copyright", "credits" or "license" for more information.
+>>> import thor
+>>> 
+```
+
 ### Docker
 
 A Docker container with the latest version of the code can be pulled using:  
+
 ```docker pull moeyensj/thor:latest```
 
 To run the container:  
+
 ```docker run -it moeyensj/thor:latest```
+
+The THOR code is installed the /projects directory, and is by default also installed in the container's Python installation. 
+To access the code in Python: 
+```
+(base) root@202110177eee:/# python
+Python 3.6.9 |Anaconda, Inc.| (default, Jul 30 2019, 19:07:31) 
+[GCC 7.3.0] on linux
+Type "help", "copyright", "credits" or "license" for more information.
+>>> import thor
+>>> 
+```
+
+**If you would like to run Jupyter Notebook or Juptyter Lab with THOR please see the installation instructions in the THOR notebooks repository.**