From 268371d956dbe5cf349f1f6d8b3e4594a5c8c479 Mon Sep 17 00:00:00 2001
From: ankitjavalkar
Date: Mon, 11 Dec 2017 12:14:33 +0530
Subject: Multiple changes: - Remove requirement files placed in docker/Files -
 Modify tasks to dynamically copy requirement files into docker directory -
 Add java installation to Docker files

---
 docker/Dockerfile_codeserver             | 8 +++++++-
 docker/Files/requirements-codeserver.txt | 6 ------
 docker/Files/requirements-common.txt     | 9 ---------
 docker/Files/requirements-py2.txt        | 2 --
 docker/Files/requirements-py3.txt        | 2 --
 5 files changed, 7 insertions(+), 20 deletions(-)
 delete mode 100644 docker/Files/requirements-codeserver.txt
 delete mode 100644 docker/Files/requirements-common.txt
 delete mode 100644 docker/Files/requirements-py2.txt
 delete mode 100644 docker/Files/requirements-py3.txt

(limited to 'docker')

diff --git a/docker/Dockerfile_codeserver b/docker/Dockerfile_codeserver
index 1bc93c2..d1cb1cc 100644
--- a/docker/Dockerfile_codeserver
+++ b/docker/Dockerfile_codeserver
@@ -2,7 +2,13 @@ FROM ubuntu:16.04
 
 MAINTAINER FOSSEE <pythonsupport@fossee.in>
 
-RUN apt-get update -y && apt-get install  git python3-pip vim libmysqlclient-dev sudo -y 
+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 vim libmysqlclient-dev sudo -y 
 
 VOLUME /Sites/online_test
 
diff --git a/docker/Files/requirements-codeserver.txt b/docker/Files/requirements-codeserver.txt
deleted file mode 100644
index e9585fa..0000000
--- a/docker/Files/requirements-codeserver.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-pytest
-python-decouple
-six
-requests
-tornado
-psutil
diff --git a/docker/Files/requirements-common.txt b/docker/Files/requirements-common.txt
deleted file mode 100644
index b4d2e5b..0000000
--- a/docker/Files/requirements-common.txt
+++ /dev/null
@@ -1,9 +0,0 @@
--r requirements-codeserver.txt
-invoke==0.21.0
-django==1.9.5
-django-taggit==0.18.1
-pytz==2016.4
-python-social-auth==0.2.19
-selenium==2.53.6
-coverage
-ruamel.yaml==0.15.23
\ No newline at end of file
diff --git a/docker/Files/requirements-py2.txt b/docker/Files/requirements-py2.txt
deleted file mode 100644
index 38777a1..0000000
--- a/docker/Files/requirements-py2.txt
+++ /dev/null
@@ -1,2 +0,0 @@
--r requirements-common.txt
-mysql-python==1.2.5
diff --git a/docker/Files/requirements-py3.txt b/docker/Files/requirements-py3.txt
deleted file mode 100644
index 3d13335..0000000
--- a/docker/Files/requirements-py3.txt
+++ /dev/null
@@ -1,2 +0,0 @@
--r requirements-common.txt
-mysqlclient==1.3.9
-- 
cgit