Python3 (WIP)

ashmodai6 · May 19, 2019 · e77d47b · e77d47b
1 parent 0e3da03
commit e77d47b
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 13 deletions.
diff --git a/auth/requirements.txt b/auth/requirements.txt
diff --git a/auth/requirements.txt b/auth/requirements.txt
@@ -0,0 +1,3 @@
+dnspython
+git+https://github.com/webpy/webpy#egg=web.py
+passlib
diff --git a/auth/requirements2.txt b/auth/requirements2.txt
diff --git a/auth/requirements3.txt b/auth/requirements3.txt
diff --git a/build.sh b/build.sh
@@ -289,14 +289,12 @@ if [[ "${IPV6}" == '1' ]] && [[ -n "${EXTIP6}" ]]; then
 fi
 log_action_end_msg $?
 
-log_action_begin_msg "installing python-pip and docker-compose"
+log_action_begin_msg "installing Python3 and requirements"
 sudo apt-get -y update &>> ${CWD}/netflix-proxy.log\
-  && sudo apt-get -y install python-pip sqlite3 &>> ${CWD}/netflix-proxy.log\
-  && pip install --upgrade pip setuptools &>> ${CWD}/netflix-proxy.log\
-  && $(which pip) install virtualenv &>> ${CWD}/netflix-proxy.log\
-  && $(which virtualenv) venv &>> ${CWD}/netflix-proxy.log\
+  && sudo apt-get -y install python3.6 python3-venv python3-pip sqlite3 &>> ${CWD}/netflix-proxy.log\
+  && $(which python) -m venv venv &>> ${CWD}/netflix-proxy.log\
   && source venv/bin/activate &>> ${CWD}/netflix-proxy.log\
-  && $(which pip) install docker-compose &>> ${CWD}/netflix-proxy.log
+  && $(which pip) install -r requirements.txt &>> ${CWD}/netflix-proxy.log
 log_action_end_msg $?
 
 log_action_begin_msg "configuring admin backend"

diff --git a/requirements.txt b/requirements.txt
@@ -0,0 +1 @@
+docker-compose