From d95b847d80ce8cd47fe811ab5fa3ca5c56ffa771 Mon Sep 17 00:00:00 2001 From: usmannasir <01-134132-158@student.bahria.edu.pk> Date: Wed, 6 Feb 2019 17:53:07 +0500 Subject: [PATCH] bug fix to docker volume mapping --- api/views.py | 2 +- dockerManager/container.py | 2 + .../static/dockerManager/dockerManager.js | 14 +- .../templates/dockerManager/runContainer.html | 386 +++++------ .../dockerManager/viewContainer.html | 604 ++++++++++-------- loginSystem/views.py | 2 +- .../templates/websiteFunctions/setupGit.html | 7 +- 7 files changed, 534 insertions(+), 483 deletions(-) diff --git a/api/views.py b/api/views.py index cce08c2e1..c28762685 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.8", build=0) + vers = version(currentVersion="1.8", build=1) vers.save() package = Package(admin=admin, packageName="Default", diskSpace=1000, diff --git a/dockerManager/container.py b/dockerManager/container.py index f1abfa687..f4c0adc1c 100644 --- a/dockerManager/container.py +++ b/dockerManager/container.py @@ -1005,6 +1005,8 @@ class ContainerManager(multi.Thread): volumes = {} for index, volume in volList.iteritems(): + if volume['src'] == '' or volume['dest'] == '': + continue volumes[volume['src']] = {'bind': volume['dest'], 'mode': 'rw'} # Prepare data for recreate function diff --git a/dockerManager/static/dockerManager/dockerManager.js b/dockerManager/static/dockerManager/dockerManager.js index a89bcf670..728de63d9 100644 --- a/dockerManager/static/dockerManager/dockerManager.js +++ b/dockerManager/static/dockerManager/dockerManager.js @@ -569,12 +569,12 @@ app.controller('viewContainer', function ($scope, $http) { $('#actionLoading').hide(); } }) - } + }; $scope.addEnvField = function () { var countEnv = Object.keys($scope.envList).length; $scope.envList[countEnv + 1] = {'name': '', 'value': ''}; - } + }; $scope.showTop = function () { $scope.topHead = []; @@ -615,7 +615,7 @@ app.controller('viewContainer', function ($scope, $http) { $scope.loadingTop = false; } - } + }; $scope.cRemove = function () { (new PNotify({ @@ -672,7 +672,7 @@ app.controller('viewContainer', function ($scope, $http) { $('#actionLoading').hide(); } }) - } + }; $scope.refreshStatus = function () { url = "/docker/getContainerStatus"; @@ -784,7 +784,7 @@ app.controller('viewContainer', function ($scope, $http) { $scope.rPolicy = "No"; } - } + }; $scope.cAction = function (action) { $('#actionLoading').show(); @@ -831,7 +831,7 @@ app.controller('viewContainer', function ($scope, $http) { $('#actionLoading').hide(); } - } + }; $scope.loadLogs = function (name) { $scope.logs = "Loading..."; @@ -865,7 +865,7 @@ app.controller('viewContainer', function ($scope, $http) { console.log("not good"); $scope.logs = "Error loading log"; } - } + }; }); diff --git a/dockerManager/templates/dockerManager/runContainer.html b/dockerManager/templates/dockerManager/runContainer.html index fde7d81d5..21f5aac79 100644 --- a/dockerManager/templates/dockerManager/runContainer.html +++ b/dockerManager/templates/dockerManager/runContainer.html @@ -3,195 +3,209 @@ {% block title %}{% trans "Run new container - CyberPanel" %}{% endblock %} {% block content %} -{% load static %} -{% get_current_language as LANGUAGE_CODE %} - - -
-
-

{% trans "Run Container" %}

-

{% trans "Modify parameters for your new container" %}

-
- - -
-
-

- {% trans "Container Details" %} -

-
- - -
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- - -
- -
- -
-
MB
-
- - {% for port, protocol in portConfig.items %} - -
- -
- -
-
- -
-
to
-
- -
-
- - {% endfor %} - - - {% for env, value in envList.items %} - - - - {% endfor %} -
-
- -
- -
- -
-
- -
-
- -
-
- -

- -
- -
-
- -
-
-
- -
-
- -
-
-
- -
-
-
- -
- -
- -

- -
- -
- - -
-
- - - -
- -
- -
-

{$ currentStatus $}

-
- -
-

{% trans "Error message:" %} {$ errorMessage $}

-
- -
-

{% trans "Container succesfully created." %}

-
- - - -
-

{% trans "Could not connect to server. Please refresh this page." %}

-
- - -
-
- -
- -
- -
-
- - -
+ {% load static %} + {% get_current_language as LANGUAGE_CODE %} + +
+
+

{% trans "Run Container" %}

+

{% trans "Modify parameters for your new container" %}

+ + +
+
+

+ {% trans "Container Details" %} +

+
+ + +
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ + +
+ +
+ +
+
MB
+
+ + {% for port, protocol in portConfig.items %} + +
+ +
+ +
+
+ +
+
to
+
+ +
+
+ + {% endfor %} + + + {% for env, value in envList.items %} + + + + {% endfor %} +
+
+ +
+ +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+ +
+
+ +
+
+
+ +
+
+ +
+
+
+ +
+
+
+ +
+ +
+ +
+
+ +
+ +
+ + +
+
+ + +
+ +
+ +
+

{$ currentStatus $}

+
+ +
+

{% trans "Error message:" %} {$ errorMessage $}

+
+ +
+

{% trans "Container succesfully created." %}

+
+ + +
+

{% trans "Could not connect to server. Please refresh this page." %}

+
+ + +
+
+ +
+ +
+ +
+
+ + +
+ +
+
+
+ +
-
- - - -
{% endblock %} \ No newline at end of file diff --git a/dockerManager/templates/dockerManager/viewContainer.html b/dockerManager/templates/dockerManager/viewContainer.html index 9c95fb44e..69f1e8f8c 100644 --- a/dockerManager/templates/dockerManager/viewContainer.html +++ b/dockerManager/templates/dockerManager/viewContainer.html @@ -3,336 +3,374 @@ {% block title %}{% trans "Container Home - CyberPanel" %}{% endblock %} {% block content %} -{% load static %} -{% get_current_language as LANGUAGE_CODE %} - + {% load static %} + {% get_current_language as LANGUAGE_CODE %} + -
+
-
-

{% trans "Manage Container" %}

-

{% trans "Currently managing: " %} {{ name }}

-
+
+

{% trans "Manage Container" %}

+

{% trans "Currently managing: " %} {{ name }}

+
-
+
-
+
-

- {% trans "Container Information" %} - -

+

+ {% trans "Container Information" %} + +

-
-
+
+
-
-
-
-
-

- {% trans "Memory Usage" %} -

-
-
-
-
{{ memoryUsage | floatformat:"2" }}%
-
-
- - -

- {% trans "CPU Usage" %} -

-
-
-
-
{{ cpuUsage }}%
-
-
- - - -
- -
-
-
- -
-
+
+
- {% trans "Container ID" %}: {{cid}} +

+ {% trans "Memory Usage" %} +

+
+
+
+
{{ memoryUsage | floatformat:"2" }}%
+
+
+ + +

+ {% trans "CPU Usage" %} +

+
+
+
+
{{ cpuUsage }}%
+
+
+ + +
+ +
+
+
+ +
+
+
+
+ {% trans "Container ID" %}: {{ cid }}
- {% trans "Image" %}: {{image}} - + {% trans "Image" %}: {{ image }} +
{% if ports %} - {% trans "Ports" %}:
- {% for iport, eport in ports.items %} - {{iport}} {% trans "to" %} {{eport}}
- {% endfor %} + {% trans "Ports" %}:
+ {% for iport, eport in ports.items %} + {{ iport }} {% trans "to" %} {{ eport }}
+ {% endfor %} {% endif %}
- - + +
-
-
- -
-
- - -
-
- -
- -
- -

- {% trans "Actions" %} -

- - -
-
- -
-
-
-
-

Main Actions - -

- Status: - -
- - - -
-
-
-
-
-
-
-

Other Actions

- Restart on system reboot:
- Export file - +
+
+ + +
+
+ +
+ +
+ +

+ {% trans "Actions" %} +

+ + +
+
+ +
+
+
+
+

Main Actions + +

+ Status: + +
+ + + + +
+
-
-
-
- -
-
- - -
- -
- -
- -

- {% trans "Logs" %} - -

- - -
-
- -
-
- -
-
-
- - - - diff --git a/loginSystem/views.py b/loginSystem/views.py index dc71d19d8..cf66976fc 100644 --- a/loginSystem/views.py +++ b/loginSystem/views.py @@ -161,7 +161,7 @@ def loadLoginPage(request): firstName="Cyber",lastName="Panel", acl=acl, token=token) admin.save() - vers = version(currentVersion="1.8", build=0) + vers = version(currentVersion="1.8", build=1) vers.save() package = Package(admin=admin, packageName="Default", diskSpace=1000, diff --git a/websiteFunctions/templates/websiteFunctions/setupGit.html b/websiteFunctions/templates/websiteFunctions/setupGit.html index 9b4527864..56075ba1e 100644 --- a/websiteFunctions/templates/websiteFunctions/setupGit.html +++ b/websiteFunctions/templates/websiteFunctions/setupGit.html @@ -47,14 +47,12 @@