Nemcio/CyberPanel
1
0
Fork 0
mirror of https://github.com/usmannasir/cyberpanel.git synced 2025-11-09 06:46:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added Volume mapping to docker app

Browse Source
This commit is contained in:
Chirag Aggarwal
2019-01-26 18:28:43 +00:00
parent f2dc74edb1
commit 8946c1ce55
9 changed files with 179 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -1 +1,2 @@
*.pyc
bin

10
CyberCP/settings.py
View File

@@ -24,7 +24,7 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
SECRET_KEY = 'xr%j*p!*$0d%(-(e%@-*hyoz4$f%y77coq0u)6pwmjg4)q&19f'
# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = False
DEBUG = True
ALLOWED_HOSTS = ['*']
@@ -110,15 +110,15 @@ DATABASES = {
'ENGINE': 'django.db.backends.mysql',
'NAME': 'cyberpanel',
'USER': 'cyberpanel',
'PASSWORD': 'Bz9gF7Hr7X4RtD',
'HOST': '127.0.0.1',
'PORT':'3307'
'PASSWORD': '7Lu8u2NkBwOyWg',
'HOST': 'localhost',
'PORT': '',
},
'rootdb': {
'ENGINE': 'django.db.backends.mysql',
'NAME': 'mysql',
'USER': 'root',
'PASSWORD': 'sXm5VlRaAsXkDd',
'PASSWORD': 'Mb5Y9dU2gVb7pM',
'HOST': 'localhost',
'PORT': '',
},

33
dockerManager/migrations/0001_initial.py Executable file
View File

@@ -0,0 +1,33 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11 on 2019-01-23 18:47
from __future__ import unicode_literals
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
initial = True
dependencies = [
('loginSystem', '0001_initial'),
]
operations = [
migrations.CreateModel(
name='Containers',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=50, unique=True)),
('cid', models.CharField(default='', max_length=64)),
('image', models.CharField(default='unknown', max_length=50)),
('tag', models.CharField(default='unknown', max_length=50)),
('memory', models.IntegerField(default=0)),
('ports', models.TextField(default='{}')),
('env', models.TextField(default='{}')),
('startOnReboot', models.IntegerField(default=0)),
('admin', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='loginSystem.Administrator')),
],
),
]

20
dockerManager/migrations/0002_containers_volumes.py Normal file
View File

@@ -0,0 +1,20 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11 on 2019-01-26 16:22
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('dockerManager', '0001_initial'),
]
operations = [
migrations.AddField(
model_name='containers',
name='volumes',
field=models.TextField(default='{}'),
),
]

1
dockerManager/models.py
View File

@@ -13,5 +13,6 @@ class Containers(models.Model):
tag = models.CharField(max_length=50, default='unknown')
memory = models.IntegerField(default=0)
ports = models.TextField(default="{}")
volumes = models.TextField(default="{}")
env = models.TextField(default="{}")
startOnReboot = models.IntegerField(default=0)

29
dockerManager/static/dockerManager/dockerManager.js
View File

@@ -119,6 +119,18 @@ app.controller('runContainer', function ($scope, $http) {
$scope.success = true;
$scope.couldNotConnect = true;
$scope.goBackDisable = true;
$scope.volList = {};
$scope.volListNumber = 0;
$scope.addVolField = function() {
$scope.volList[$scope.volListNumber] = {'dest':'', 'src':''};
$scope.volListNumber = $scope.volListNumber + 1;
console.log($scope.volList)
}
$scope.removeVolField = function(){
delete $scope.volList[$scope.volListNumber - 1];
$scope.volListNumber = $scope.volListNumber - 1;
}
$scope.addEnvField = function () {
var countEnv = Object.keys($scope.envList).length;
@@ -157,8 +169,8 @@ app.controller('runContainer', function ($scope, $http) {
memory: memory,
dockerOwner: dockerOwner,
image: image,
envList: $scope.envList
envList: $scope.envList,
volList: $scope.volList
};
$.each($scope.portType, function (port, protocol) {
@@ -698,6 +710,16 @@ app.controller('viewContainer', function ($scope, $http) {
}
}
$scope.addVolField = function() {
$scope.volList[$scope.volListNumber] = {'dest':'', 'src':''};
$scope.volListNumber = $scope.volListNumber + 1;
console.log($scope.volList)
}
$scope.removeVolField = function(){
delete $scope.volList[$scope.volListNumber - 1];
$scope.volListNumber = $scope.volListNumber - 1;
}
$scope.saveSettings = function () {
$('#containerSettingLoading').show();
@@ -709,7 +731,8 @@ app.controller('viewContainer', function ($scope, $http) {
memory: $scope.memory,
startOnReboot: $scope.startOnReboot,
envConfirmation: $scope.envConfirmation,
envList: $scope.envList
envList: $scope.envList,
volList: $scope.volList
};
console.log(data)

33
dockerManager/templates/dockerManager/runContainer.html
View File

@@ -106,12 +106,39 @@
</div>
</div>
</div>
</div>
<div ng-hide="installationDetailsForm" class="col-md-offset-3">
<button type="button" class="btn btn-info" ng-click="addEnvField()">Add more</button>
</div><br>
<div ng-hide="installationDetailsForm" class="form-group text-center">
<label class="control-label">
{% trans "Map Volumes" %}
</label>
</div>
<div ng-repeat="volume in volList track by $index">
<div ng-hide="installationDetailsForm" class="form-group">
<div class="col-sm-3"></div>
<div class="col-sm-2">
<input type="text" class="form-control" ng-model="volList[$index].dest" placeholder="Destination" required>
</div>
<div class="col-sm-4">
<input type="text" class="form-control" ng-model="volList[$index].src" placeholder="Source" required>
</div>
<div ng-show="$last">
<div class="col-sm-1">
<button class="btn btn-primary" type="button" ng-click="removeVolField()"><i class="fa fa-times"></i></button>
</div>
</div>
</div>
</div>
<div ng-hide="installationDetailsForm" class="text-center">
<button type="button" class="btn btn-info" ng-click="addVolField()">{% trans "Add field" %}</button>
</div><br>
<div ng-hide="installationDetailsForm" class="form-group">
<label class="col-sm-3 control-label"></label>
<div class="col-sm-4">

41
dockerManager/templates/dockerManager/viewContainer.html
View File

@@ -210,12 +210,12 @@
<div class="checkbox">
<label>
<input ng-model="envConfirmation" type="checkbox">
Editing ENV will recreate container <i class="fa fa-warning" title="If you tick this checkbox, your container will be recreated with saved information. Data saved inside container will be deleted (Not avaialble for container created outside of cyberpanel)"></i>
Editing ENV or Volume will recreate container <i class="fa fa-warning" title="If you tick this checkbox, your container will be recreated with saved information. Data saved inside container will be deleted (Not avaialble for container created outside of cyberpanel)"></i>
</label>
</div>
</div>
</div>
<hr>
<span ng-init="envList = {}"></span>
{% for env, value in envList.items %}
@@ -245,6 +245,43 @@
<button type="button" class="btn btn-info" ng-click="addEnvField()">Add more</button>
</div><br>
<span ng-init="volList = {}"></span>
{% for key, value in volList.items %}
<span ng-init="volList[{{ forloop.counter0 }}] = {'dest':'{{value.bind}}' , 'src':'{{key}}'}"></span>
<span ng-init="volListNumber={{ forloop.counter0 }} + 1"></span>
{% endfor %}
<hr>
<div ng-hide="installationDetailsForm" class="form-group text-center">
<label class="control-label">
{% trans "Map Volumes" %}
</label>
</div>
<div ng-repeat="volume in volList track by $index">
<div ng-hide="installationDetailsForm" class="form-group">
<div class="col-sm-3"></div>
<div class="col-sm-2">
<input type="text" class="form-control" ng-model="volList[$index].dest" placeholder="Destination" required>
</div>
<div class="col-sm-4">
<input type="text" class="form-control" ng-model="volList[$index].src" placeholder="Source" required>
</div>
<div ng-show="$last">
<div class="col-sm-1">
<button class="btn btn-primary" type="button" ng-click="removeVolField()"><i class="fa fa-times"></i></button>
</div>
</div>
</div>
</div>
<div ng-hide="installationDetailsForm" class="text-center">
<button type="button" class="btn btn-info" ng-click="addVolField()">{% trans "Add field" %}</button>
</div><br>
</form>
</div>

28
plogical/container.py
View File

@@ -182,7 +182,7 @@ class ContainerManager(multi.Thread):
data['ports'] = json.loads(con.ports)
data['cid'] = con.cid
data['envList'] = json.loads(con.env)
print data['envList']
data['volList'] = json.loads(con.volumes)
stats = container.stats(decode=False, stream=False)
logs = container.logs(stream=True)
@@ -300,6 +300,7 @@ class ContainerManager(multi.Thread):
dockerOwner = data['dockerOwner']
memory = data['memory']
envList = data['envList']
volList = data['volList']
inspectImage = dockerAPI.inspect_image(image + ":" + tag)
portConfig = {}
@@ -319,6 +320,12 @@ class ContainerManager(multi.Thread):
return HttpResponse(json_data)
portConfig[item] = data[item]
volumes = {}
for index, volume in volList.iteritems():
volumes[volume['src']] = {'bind': volume['dest'],
'mode': 'rw'}
print volumes
## Create Configurations
admin = Administrator.objects.get(userName=dockerOwner)
@@ -327,7 +334,8 @@ class ContainerManager(multi.Thread):
'name': name,
'ports': portConfig,
'publish_all_ports': True,
'environment': envDict}
'environment': envDict,
'volumes': volumes}
containerArgs['mem_limit'] = memory * 1048576; # Converts MB to bytes ( 0 * x = 0 for unlimited memory)
@@ -347,6 +355,7 @@ class ContainerManager(multi.Thread):
image=image,
memory=memory,
ports=json.dumps(portConfig),
volumes=json.dumps(volumes),
env=json.dumps(envDict),
cid=container.id)
@@ -881,11 +890,16 @@ class ContainerManager(multi.Thread):
def doRecreateContainer(self, userID, data, con):
try:
client = docker.from_env()
dockerAPI = docker.APIClient()
name = data['name']
unlisted = data['unlisted'] # Pass this as 1 if image is not known for container
image = data['image']
tag = data['tag']
env = data['env']
volumes = data['volumes']
port = data['ports']
memory = data['memory']
@@ -902,6 +916,7 @@ class ContainerManager(multi.Thread):
'name': name,
'ports': port,
'environment': env,
'volumes': volumes,
'publish_all_ports': True,
'mem_limit': memory * 1048576}
@@ -928,6 +943,7 @@ class ContainerManager(multi.Thread):
memory = data['memory']
startOnReboot = data['startOnReboot']
envList = data['envList']
volList = data['volList']
if startOnReboot == True:
startOnReboot = 1
@@ -966,7 +982,10 @@ class ContainerManager(multi.Thread):
if (value['name'] != '') or (value['value'] != ''):
envDict[value['name']] = value['value']
print envDict
volumes = {}
for index, volume in volList.iteritems():
volumes[volume['src']] = {'bind': volume['dest'],
'mode': 'rw'}
# Prepare data for recreate function
data = {
'name': name,
@@ -975,7 +994,7 @@ class ContainerManager(multi.Thread):
'tag': con.tag,
'env': envDict,
'ports': json.loads(con.ports),
# No filter needed now as its ports are filtered when adding to database
'volumes': volumes,
'memory': con.memory
}
@@ -986,6 +1005,7 @@ class ContainerManager(multi.Thread):
return HttpResponse(json_data)
con.env = json.dumps(envDict)
con.volumes = json.dumps(volumes)
con.save()
data_ret = {'saveSettingsStatus': 1, 'error_message': 'None'}