- Modify code server docker file to remove Oracle JDK, JRE

- Add decorator to tasks

3 files changed, 11 insertions, 9 deletions

diff --git a/README_production.rst b/README_production.rst
index 02b2008..28b756e 100644
--- a/README_production.rst
+++ b/README_production.rst
@@ -63,7 +63,9 @@ To deploy this app follow the steps below:
 
     ::
 
-        $ sudo python yaksh/code_server.py
+        $ sudo python -m yaksh.code_server # For Python 2
+
+        $ sudo python3 -m yaksh.code_server # For Python 3
 
     Put this in the background once it has started since this will not
     return back the prompt. It is important that the server be running
@@ -194,7 +196,7 @@ Using Dockerized Code Server
    /path/to/online\_test
 
 3. Create a docker image. This may take a few minutes docker build -t
-   yaksh\_code\_server ./docker/Dockerfile\_codeserver
+   yaksh\_code\_server -f ./docker/Dockerfile\_codeserver
 
 4. Check if the image has been created using the output of, docker
    images
@@ -204,6 +206,8 @@ Using Dockerized Code Server
    code\_server.py within it), it will also bind the ports of the host
    with those of the container
 
+6. You can use ``invoke --list`` to get a list of all the available commands
+
 .. _deploying-multiple-dockers:
 
 ######################################
@@ -216,11 +220,11 @@ Follow these steps to deploy and run the Django Server, MySQL instance and Code
 
 2. Install `Docker Compose <https://docs.docker.com/compose/install/>`__
 
-2. Go to the directory where the project is located at:
+2. Go to the ``docker`` directory where the project is located:
    
    ::
 
-       cd /path/to/online_test
+       cd /path/to/online_test/docker
 
 3. Build the docker images
 
@@ -254,6 +258,8 @@ Follow these steps to deploy and run the Django Server, MySQL instance and Code
 
        invoke clean
 
+9. You can use ``invoke --list`` to get a list of all the available commands
+
 
 .. _add-commands:
 
diff --git a/docker/Dockerfile_codeserver b/docker/Dockerfile_codeserver
index 0112c88..955e681 100644
--- a/docker/Dockerfile_codeserver
+++ b/docker/Dockerfile_codeserver
@@ -3,11 +3,6 @@ FROM ubuntu:16.04
 MAINTAINER FOSSEE <pythonsupport@fossee.in>
 
 RUN apt-get update && \
-apt-get install -y  software-properties-common && \
-echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | debconf-set-selections && \
-add-apt-repository -y ppa:webupd8team/java && \
-apt-get update && \
-apt-get install -y oracle-java8-installer && \
 apt-get install git python3-pip libmysqlclient-dev sudo default-jre default-jdk -y 
 
 VOLUME /Sites/online_test
diff --git a/tasks.py b/tasks.py
index 8c78838..ac2721a 100644
--- a/tasks.py
+++ b/tasks.py
@@ -45,6 +45,7 @@ def setupdb(ctx):
     ctx.run("python manage.py migrate")
     print("** Done! Migrations complete **")
 
+@task
 def loadfixtures(ctx):
     print("** Loading fixtures into database **")
     ctx.run("python manage.py loaddata demo_fixtures.json")