From 23979ebc260aae856533452a64fadc81c24df266 Mon Sep 17 00:00:00 2001 From: usmannasir <01-134132-158@student.bahria.edu.pk> Date: Sun, 27 Jan 2019 01:18:49 +0500 Subject: [PATCH] merge docker volume code changes --- .gitignore | 1 + CyberCP/settings.py | 3 +- CyberCP/urls.py | 1 + api/views.py | 2 +- .../templates/baseTemplate/index.html | 22 + baseTemplate/urls.py | 1 - cloudAPI/views.py | 2 + dockerManager/container.py | 1120 +++++++++++++++++ dockerManager/decorators.py | 5 +- dockerManager/models.py | 1 + .../static/dockerManager/dockerManager.js | 45 +- .../templates/dockerManager/runContainer.html | 31 +- .../dockerManager/viewContainer.html | 53 +- dockerManager/views.py | 2 +- install/install.py | 4 +- install/litespeed/functions.sh | 183 ++- install/litespeed/install.sh | 5 +- install/lscp.tar.gz | Bin 9818736 -> 9829615 bytes loginSystem/templates/loginSystem/login.html | 2 +- loginSystem/views.py | 2 +- plogical/httpProc.py | 8 + plogical/processUtilities.py | 12 + plogical/upgrade.py | 112 ++ s3Backups/s3Backups.py | 33 +- serverStatus/litespeed/functions.sh | 185 ++- serverStatus/litespeed/install.sh | 7 +- static/websiteFunctions/websiteFunctions.js | 2 +- .../websiteFunctions/websiteFunctions.js | 2 +- .../websiteFunctions/createWebsite.html | 3 - 29 files changed, 1615 insertions(+), 234 deletions(-) create mode 100644 dockerManager/container.py diff --git a/.gitignore b/.gitignore index 0d20b6487..1b6d5405b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ *.pyc +containerization diff --git a/CyberCP/settings.py b/CyberCP/settings.py index 0dd5d5dd9..8cac18eab 100644 --- a/CyberCP/settings.py +++ b/CyberCP/settings.py @@ -65,7 +65,8 @@ INSTALLED_APPS = [ 'cloudAPI', 'highAvailability', 's3Backups', - 'dockerManager' + 'dockerManager', + 'containerization' ] MIDDLEWARE = [ diff --git a/CyberCP/urls.py b/CyberCP/urls.py index 644aa6156..fdfd5addc 100644 --- a/CyberCP/urls.py +++ b/CyberCP/urls.py @@ -41,4 +41,5 @@ urlpatterns = [ url(r'^emailMarketing/', include('emailMarketing.urls')), url(r'^cloudAPI/', include('cloudAPI.urls')), url(r'^docker/', include('dockerManager.urls')), + url(r'^container/', include('containerization.urls')), ] diff --git a/api/views.py b/api/views.py index b76582714..cce08c2e1 100644 --- a/api/views.py +++ b/api/views.py @@ -570,7 +570,7 @@ def changeAdminPassword(request): firstName="Cyber", lastName="Panel", acl=acl, token=token) admin.save() - vers = version(currentVersion="1.7", build=7) + vers = version(currentVersion="1.8", build=0) vers.save() package = Package(admin=admin, packageName="Default", diskSpace=1000, diff --git a/baseTemplate/templates/baseTemplate/index.html b/baseTemplate/templates/baseTemplate/index.html index 66026ffc3..8dce01542 100644 --- a/baseTemplate/templates/baseTemplate/index.html +++ b/baseTemplate/templates/baseTemplate/index.html @@ -96,6 +96,7 @@ href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.css"> + @@ -115,6 +116,8 @@ }, 300); }); + + @@ -608,6 +611,24 @@