From d6759d3d1b4f7232dbca2025e67ff4f2812968c9 Mon Sep 17 00:00:00 2001
From: ankitjavalkar
Date: Wed, 1 Nov 2017 17:43:45 +0530
Subject: - Add a pyinvoke based script for running the django server and code
 server - Modify the requirements to separate the requirements for code server
 - Modify the docker file - Add a script that runs within the docker instance

---
 Dockerfile | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'Dockerfile')

diff --git a/Dockerfile b/Dockerfile
index 72a74f4..5928369 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,14 @@
-FROM debian:8.2
+FROM ubuntu:16.04
 MAINTAINER FOSSEE <pythonsupport@fossee.in>
 
 # Update Packages and Install Python & net-tools
-RUN apt-get update && apt-get install -y python net-tools python-pip && pip install tornado
+RUN apt-get update && \
+apt-get install -y  software-properties-common && \
+add-apt-repository ppa:webupd8team/java -y && \
+apt-get update && \
+apt-get install -y software-properties-common python net-tools git python3-pip vim libmysqlclient-dev scilab build-essential oracle-java8-installer && \
+mkdir /Sites
 
-# Copy the project folder from host into container
-COPY ./yaksh /src/yaksh
+VOLUME /src/online_test
 
-WORKDIR /src
-
-# Run Yaksh code server
-CMD ["python", "-m", "yaksh.code_server"]
+WORKDIR /src/online_test
-- 
cgit 


From 2df9850b13bffd83c244a2994d512c79840c17be Mon Sep 17 00:00:00 2001
From: ankitjavalkar
Date: Mon, 6 Nov 2017 20:23:04 +0530
Subject: Add further changes to invoke script and yaksh-script

---
 Dockerfile | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'Dockerfile')

diff --git a/Dockerfile b/Dockerfile
index 5928369..f9d4b5f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,11 +4,8 @@ MAINTAINER FOSSEE <pythonsupport@fossee.in>
 # Update Packages and Install Python & net-tools
 RUN apt-get update && \
 apt-get install -y  software-properties-common && \
-add-apt-repository ppa:webupd8team/java -y && \
+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 software-properties-common python net-tools git python3-pip vim libmysqlclient-dev scilab build-essential oracle-java8-installer && \
-mkdir /Sites
-
-VOLUME /src/online_test
-
-WORKDIR /src/online_test
+apt-get install -y oracle-java8-installer && \
+apt-get install -y sudo software-properties-common python net-tools git python3-pip vim libmysqlclient-dev scilab build-essential
-- 
cgit 


From 6fb9f74ee9d2de9a8fb6714907da52a3ed870431 Mon Sep 17 00:00:00 2001
From: ankitjavalkar
Date: Wed, 8 Nov 2017 16:03:10 +0530
Subject: - Add pytest as a requirement to the requirements file - Modify image
 name in tasks.py

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Dockerfile')

diff --git a/Dockerfile b/Dockerfile
index f9d4b5f..6a7d894 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,4 +8,4 @@ echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | de
 add-apt-repository -y ppa:webupd8team/java && \
 apt-get update && \
 apt-get install -y oracle-java8-installer && \
-apt-get install -y sudo software-properties-common python net-tools git python3-pip vim libmysqlclient-dev scilab build-essential
+apt-get install -y sudo python net-tools git python3-pip vim libmysqlclient-dev scilab build-essential python3-numpy python3-scipy ipython3 ipython3-notebook python3-pandas python3-nose
-- 
cgit