-
-
+
+
@@ -146,529 +192,699 @@
-
-
-
- Cyber Panel
- {% trans "Web Hosting Control Panel" %}
-
-
- Cyber Panel
- {% trans "Web Hosting Control Panel" %}
-
-
-
-
-
-
-
-
- 
- {$ currentAdmin $}
-
-
-
- {$ currentAdmin $}
-
-
-
-
-
-
-
+
- Change photo
-
-
-
-
+
+
-
+
+ Cyber Panel
+ {% trans "Web Hosting Control Panel" %}
+
+
+ Cyber Panel
+ {% trans "Web Hosting Control Panel" %}
+
+
+
+
+
+
+
-
+
+
+ {$ currentAdmin $}
+
+
+
-
+ {$ currentAdmin $}
+
+
+
+
-
-
+
+
+
+
+ Change photo
+
+
+
+
+
+
\ No newline at end of file
diff --git a/dockerManager/static/dockerManager/dockerManager.js b/dockerManager/static/dockerManager/dockerManager.js
index 1faee184a..96421e682 100644
--- a/dockerManager/static/dockerManager/dockerManager.js
+++ b/dockerManager/static/dockerManager/dockerManager.js
@@ -1,58 +1,117 @@
-app.controller('installDocker', function($scope,$http) {
+
+
+app.controller('installDocker', function ($scope, $http, $timeout, $window) {
$scope.installDockerStatus = true;
- $scope.installDocker = function(){
+ $scope.installBoxGen = true;
+ $scope.dockerInstallBTN = false;
+
+ $scope.installDocker = function () {
+
$scope.installDockerStatus = false;
+ $scope.installBoxGen = true;
+ $scope.dockerInstallBTN = true;
+
url = "/docker/installDocker";
+
var data = {};
var config = {
- headers : {
+ headers: {
'X-CSRFToken': getCookie('csrftoken')
}
};
- $http.post(url, data,config).then(ListInitialDatas, cantLoadInitialDatas);
+
+ $http.post(url, data, config).then(ListInitialDatas, cantLoadInitialDatas);
+
function ListInitialDatas(response) {
- if (response.data.installDockerStatus === 1)
- {
- new PNotify({
- title: 'Docker installed',
- text: 'Reloading...',
- type: 'success'
- });
- location.reload();
+ $scope.cyberPanelLoading = true;
+ if (response.data.status === 1) {
+ $scope.installBoxGen = false;
+ getRequestStatus();
}
- else{
+ else {
new PNotify({
- title: 'Failed to complete request',
- text: response.data.error,
+ title: 'Operation Failed!',
+ text: response.data.error_message,
type: 'error'
});
}
- $scope.installDockerStatus = true;
}
+
function cantLoadInitialDatas(response) {
- $scope.installDockerStatus = true;
+ $scope.cyberPanelLoading = true;
new PNotify({
- title: 'Failed to complete request',
+ title: 'Operation Failed!',
+ text: 'Could not connect to server, please refresh this page',
type: 'error'
});
}
+
+ };
+
+ function getRequestStatus() {
+ $scope.cyberPanelLoading = false;
+
+ url = "/serverstatus/switchTOLSWSStatus";
+
+ var data = {};
+
+ var config = {
+ headers: {
+ 'X-CSRFToken': getCookie('csrftoken')
+ }
+ };
+
+
+ $http.post(url, data, config).then(ListInitialDatas, cantLoadInitialDatas);
+
+
+ function ListInitialDatas(response) {
+ if (response.data.abort === 0) {
+ $scope.requestData = response.data.requestStatus;
+ $timeout(getRequestStatus, 1000);
+ }
+ else {
+ // Notifications
+ $scope.cyberPanelLoading = true;
+ $timeout.cancel();
+ $scope.requestData = response.data.requestStatus;
+ if (response.data.installed === 1) {
+ $timeout(function () {
+ $window.location.reload();
+ }, 3000);
+ }
+
+ }
+ }
+
+ function cantLoadInitialDatas(response) {
+ $scope.cyberPanelLoading = true;
+ new PNotify({
+ title: 'Operation Failed!',
+ text: 'Could not connect to server, please refresh this page',
+ type: 'error'
+ });
+
+
+ }
+
}
});
/* Java script code for docker management */
var delayTimer = null;
-app.controller('dockerImages', function($scope,$http) {
+app.controller('dockerImages', function ($scope) {
$scope.tagList = [];
$scope.imageTag = {};
});
/* Java script code to install Container */
-app.controller('runContainer', function($scope,$http) {
+app.controller('runContainer', function ($scope, $http) {
$scope.containerCreationLoading = true;
$scope.installationDetailsForm = false;
$scope.installationProgress = true;
@@ -60,16 +119,16 @@ app.controller('runContainer', function($scope,$http) {
$scope.success = true;
$scope.couldNotConnect = true;
$scope.goBackDisable = true;
-
- $scope.addEnvField = function() {
+
+ $scope.addEnvField = function () {
var countEnv = Object.keys($scope.envList).length;
- $scope.envList[countEnv+1] = {'name':'', 'value':''};
+ $scope.envList[countEnv + 1] = {'name': '', 'value': ''};
}
var statusFile;
- $scope.createContainer = function(){
-
+ $scope.createContainer = function () {
+
console.log($scope.iport);
console.log($scope.portType);
@@ -99,32 +158,31 @@ app.controller('runContainer', function($scope,$http) {
dockerOwner: dockerOwner,
image: image,
envList: $scope.envList
-
+
};
-
- $.each($scope.portType, function( port, protocol ) {
- data[port + "/" + protocol] = $scope.eport[port];
+
+ $.each($scope.portType, function (port, protocol) {
+ data[port + "/" + protocol] = $scope.eport[port];
});
-
+
console.log(data)
var config = {
- headers : {
+ headers: {
'X-CSRFToken': getCookie('csrftoken')
}
};
- $http.post(url, data,config).then(ListInitialDatas, cantLoadInitialDatas);
+ $http.post(url, data, config).then(ListInitialDatas, cantLoadInitialDatas);
function ListInitialDatas(response) {
- if (response.data.createContainerStatus === 1)
- {
+ if (response.data.createContainerStatus === 1) {
$scope.currentStatus = "Successful. Redirecting...";
window.location.href = "/docker/view/" + $scope.name
}
- else{
+ else {
$scope.containerCreationLoading = true;
$scope.installationDetailsForm = true;
@@ -138,8 +196,8 @@ app.controller('runContainer', function($scope,$http) {
}
-
}
+
function cantLoadInitialDatas(response) {
$scope.containerCreationLoading = true;
@@ -168,27 +226,27 @@ app.controller('runContainer', function($scope,$http) {
/* Javascript code for listing containers */
-app.controller('listContainers', function($scope,$http) {
+app.controller('listContainers', function ($scope, $http) {
$scope.activeLog = "";
$scope.assignActive = "";
-
- $scope.assignContainer = function(name){
+
+ $scope.assignContainer = function (name) {
$("#assign").modal("show");
$scope.assignActive = name;
- }
-
- $scope.submitAssignContainer = function(){
+ };
+
+ $scope.submitAssignContainer = function () {
url = "/docker/assignContainer";
var data = {name: $scope.assignActive, admin: $scope.dockerOwner};
var config = {
- headers : {
+ headers: {
'X-CSRFToken': getCookie('csrftoken')
}
};
- $http.post(url, data,config).then(ListInitialData, cantLoadInitialData);
+ $http.post(url, data, config).then(ListInitialData, cantLoadInitialData);
function ListInitialData(response) {
@@ -199,8 +257,7 @@ app.controller('listContainers', function($scope,$http) {
});
window.location.href = '/docker/listContainers';
}
- else
- {
+ else {
new PNotify({
title: 'Unable to complete request',
text: response.data.error_message,
@@ -209,6 +266,7 @@ app.controller('listContainers', function($scope,$http) {
}
$("#assign").modal("hide");
}
+
function cantLoadInitialData(response) {
console.log("not good");
new PNotify({
@@ -217,9 +275,9 @@ app.controller('listContainers', function($scope,$http) {
});
$("#assign").modal("hide");
}
- }
-
- $scope.delContainer = function(name, unlisted=false){
+ };
+
+ $scope.delContainer = function (name, unlisted=false) {
(new PNotify({
title: 'Confirmation Needed',
text: 'Are you sure?',
@@ -235,19 +293,19 @@ app.controller('listContainers', function($scope,$http) {
history: {
history: false
}
- })).get().on('pnotify.confirm', function() {
+ })).get().on('pnotify.confirm', function () {
$('#imageLoading').show();
url = "/docker/delContainer";
var data = {name: name, unlisted: unlisted};
var config = {
- headers : {
+ headers: {
'X-CSRFToken': getCookie('csrftoken')
}
};
- $http.post(url, data,config).then(ListInitialData, cantLoadInitialData);
+ $http.post(url, data, config).then(ListInitialData, cantLoadInitialData);
function ListInitialData(response) {
@@ -272,18 +330,18 @@ app.controller('listContainers', function($scope,$http) {
history: {
history: false
}
- })).get().on('pnotify.confirm', function() {
+ })).get().on('pnotify.confirm', function () {
url = "/docker/delContainer";
var data = {name: name, unlisted: unlisted, force: 1};
var config = {
- headers : {
+ headers: {
'X-CSRFToken': getCookie('csrftoken')
}
};
- $http.post(url, data,config).then(ListInitialData, cantLoadInitialData);
+ $http.post(url, data, config).then(ListInitialData, cantLoadInitialData);
function ListInitialData(response) {
@@ -296,27 +354,28 @@ app.controller('listContainers', function($scope,$http) {
}
$('#imageLoading').hide();
}
+
function cantLoadInitialData(response) {
$('#imageLoading').hide();
}
})
}
- else
- {
+ else {
$("#listFail").fadeIn();
$scope.errorMessage = response.data.error_message;
}
$('#imageLoading').hide();
}
+
function cantLoadInitialData(response) {
$('#imageLoading').hide();
}
})
- }
-
- $scope.showLog = function(name, refresh = false){
+ }
+
+ $scope.showLog = function (name, refresh = false) {
$scope.logs = "";
- if (refresh === false){
+ if (refresh === false) {
$('#logs').modal('show');
$scope.activeLog = name;
}
@@ -324,19 +383,19 @@ app.controller('listContainers', function($scope,$http) {
name = $scope.activeLog;
}
console.log(name)
- $scope.logs = "Loading...";
-
+ $scope.logs = "Loading...";
+
url = "/docker/getContainerLogs";
var data = {name: name};
var config = {
- headers : {
+ headers: {
'X-CSRFToken': getCookie('csrftoken')
}
};
- $http.post(url, data,config).then(ListInitialData, cantLoadInitialData);
+ $http.post(url, data, config).then(ListInitialData, cantLoadInitialData);
function ListInitialData(response) {
@@ -345,16 +404,16 @@ app.controller('listContainers', function($scope,$http) {
if (response.data.containerLogStatus === 1) {
$scope.logs = response.data.containerLog;
}
- else
- {
+ else {
new PNotify({
- title: 'Unable to complete request',
- text: response.data.error_message,
- type: 'error'
+ title: 'Unable to complete request',
+ text: response.data.error_message,
+ type: 'error'
});
}
}
+
function cantLoadInitialData(response) {
new PNotify({
title: 'Unable to complete request',
@@ -368,12 +427,12 @@ app.controller('listContainers', function($scope,$http) {
var data = {page: 1};
var config = {
- headers : {
+ headers: {
'X-CSRFToken': getCookie('csrftoken')
}
};
- $http.post(url, data,config).then(ListInitialData, cantLoadInitialData);
+ $http.post(url, data, config).then(ListInitialData, cantLoadInitialData);
function ListInitialData(response) {
@@ -386,67 +445,66 @@ app.controller('listContainers', function($scope,$http) {
console.log($scope.ContainerList);
$("#listFail").hide();
}
- else
- {
+ else {
$("#listFail").fadeIn();
$scope.errorMessage = response.data.error_message;
}
}
+
function cantLoadInitialData(response) {
console.log("not good");
}
- $scope.getFurtherContainersFromDB = function(pageNumber) {
-
- var config = {
- headers : {
- 'X-CSRFToken': getCookie('csrftoken')
- }
- };
-
- var data = {page: pageNumber};
-
-
- dataurl = "/docker/getContainerList";
-
- $http.post(dataurl, data,config).then(ListInitialData, cantLoadInitialData);
-
-
- function ListInitialData(response) {
- if (response.data.listContainerStatus ===1) {
-
- var finalData = JSON.parse(response.data.data);
- $scope.ContainerList = finalData;
- $("#listFail").hide();
- }
- else
- {
- $("#listFail").fadeIn();
- $scope.errorMessage = response.data.error_message;
- console.log(response.data);
-
- }
- }
- function cantLoadInitialData(response) {
- console.log("not good");
- }
-
-
+ $scope.getFurtherContainersFromDB = function (pageNumber) {
+ var config = {
+ headers: {
+ 'X-CSRFToken': getCookie('csrftoken')
+ }
};
+
+ var data = {page: pageNumber};
+
+
+ dataurl = "/docker/getContainerList";
+
+ $http.post(dataurl, data, config).then(ListInitialData, cantLoadInitialData);
+
+
+ function ListInitialData(response) {
+ if (response.data.listContainerStatus === 1) {
+
+ var finalData = JSON.parse(response.data.data);
+ $scope.ContainerList = finalData;
+ $("#listFail").hide();
+ }
+ else {
+ $("#listFail").fadeIn();
+ $scope.errorMessage = response.data.error_message;
+ console.log(response.data);
+
+ }
+ }
+
+ function cantLoadInitialData(response) {
+ console.log("not good");
+ }
+
+
+ };
});
/* Java script code for containerr home page */
-app.controller('viewContainer', function($scope,$http) {
+app.controller('viewContainer', function ($scope, $http) {
$scope.cName = "";
$scope.status = "";
$scope.savingSettings = false;
$scope.loadingTop = false;
-
- $scope.recreate = function() {
+
+ $scope.recreate = function () {
(new PNotify({
title: 'Confirmation Needed',
text: 'Are you sure?',
@@ -462,18 +520,18 @@ app.controller('viewContainer', function($scope,$http) {
history: {
history: false
}
- })).get().on('pnotify.confirm', function() {
- $('#infoLoading').show();
-
- url = "/docker/recreateContainer";
+ })).get().on('pnotify.confirm', function () {
+ $('#infoLoading').show();
+
+ url = "/docker/recreateContainer";
var data = {name: $scope.cName};
var config = {
- headers : {
+ headers: {
'X-CSRFToken': getCookie('csrftoken')
}
};
- $http.post(url, data,config).then(ListInitialData, cantLoadInitialData);
+ $http.post(url, data, config).then(ListInitialData, cantLoadInitialData);
function ListInitialData(response) {
if (response.data.recreateContainerStatus === 1) {
new PNotify({
@@ -483,8 +541,7 @@ app.controller('viewContainer', function($scope,$http) {
});
location.reload();
}
- else
- {
+ else {
new PNotify({
title: 'Unable to complete request',
text: response.data.error_message,
@@ -494,43 +551,43 @@ app.controller('viewContainer', function($scope,$http) {
}
$('#infoLoading').hide();
}
+
function cantLoadInitialData(response) {
PNotify.error({
- title: 'Unable to complete request',
- text: "Problem in connecting to server"
+ title: 'Unable to complete request',
+ text: "Problem in connecting to server"
});
$('#actionLoading').hide();
}
- })
+ })
}
-
- $scope.addEnvField = function() {
+
+ $scope.addEnvField = function () {
var countEnv = Object.keys($scope.envList).length;
- $scope.envList[countEnv+1] = {'name':'', 'value':''};
+ $scope.envList[countEnv + 1] = {'name': '', 'value': ''};
}
-
- $scope.showTop = function(){
+
+ $scope.showTop = function () {
$scope.topHead = [];
$scope.topProcesses = [];
$scope.loadingTop = true;
$("#processes").modal("show");
-
+
url = "/docker/getContainerTop";
var data = {name: $scope.cName};
var config = {
- headers : {
+ headers: {
'X-CSRFToken': getCookie('csrftoken')
}
};
-
- $http.post(url, data,config).then(ListInitialData, cantLoadInitialData);
+
+ $http.post(url, data, config).then(ListInitialData, cantLoadInitialData);
function ListInitialData(response) {
if (response.data.containerTopStatus === 1) {
$scope.topHead = response.data.processes.Titles;
$scope.topProcesses = response.data.processes.Processes;
}
- else
- {
+ else {
new PNotify({
title: 'Unable to complete request',
text: response.data.error_message,
@@ -540,17 +597,18 @@ app.controller('viewContainer', function($scope,$http) {
}
$scope.loadingTop = false;
}
+
function cantLoadInitialData(response) {
PNotify.error({
- title: 'Unable to complete request',
- text: "Problem in connecting to server"
+ title: 'Unable to complete request',
+ text: "Problem in connecting to server"
});
$scope.loadingTop = false;
}
-
+
}
-
- $scope.cRemove = function(){
+
+ $scope.cRemove = function () {
(new PNotify({
title: 'Confirmation Needed',
text: 'Are you sure?',
@@ -566,18 +624,18 @@ app.controller('viewContainer', function($scope,$http) {
history: {
history: false
}
- })).get().on('pnotify.confirm', function() {
- $('#actionLoading').show();
-
- url = "/docker/delContainer";
+ })).get().on('pnotify.confirm', function () {
+ $('#actionLoading').show();
+
+ url = "/docker/delContainer";
var data = {name: $scope.cName, unlisted: false};
var config = {
- headers : {
+ headers: {
'X-CSRFToken': getCookie('csrftoken')
}
};
- $http.post(url, data,config).then(ListInitialData, cantLoadInitialData);
+ $http.post(url, data, config).then(ListInitialData, cantLoadInitialData);
function ListInitialData(response) {
if (response.data.delContainerStatus === 1) {
new PNotify({
@@ -587,8 +645,7 @@ app.controller('viewContainer', function($scope,$http) {
});
window.location.href = '/docker/listContainers';
}
- else
- {
+ else {
new PNotify({
title: 'Unable to complete request',
text: response.data.error_message,
@@ -597,33 +654,33 @@ app.controller('viewContainer', function($scope,$http) {
}
$('#actionLoading').hide();
}
+
function cantLoadInitialData(response) {
PNotify.error({
- title: 'Unable to complete request',
- text: "Problem in connecting to server"
+ title: 'Unable to complete request',
+ text: "Problem in connecting to server"
});
$('#actionLoading').hide();
}
- })
+ })
}
-
- $scope.refreshStatus = function(){
+
+ $scope.refreshStatus = function () {
url = "/docker/getContainerStatus";
var data = {name: $scope.cName};
var config = {
- headers : {
+ headers: {
'X-CSRFToken': getCookie('csrftoken')
}
};
-
- $http.post(url, data,config).then(ListInitialData, cantLoadInitialData);
+
+ $http.post(url, data, config).then(ListInitialData, cantLoadInitialData);
function ListInitialData(response) {
if (response.data.containerStatus === 1) {
console.log(response.data.status);
$scope.status = response.data.status;
}
- else
- {
+ else {
new PNotify({
title: 'Unable to complete request',
text: response.data.error_message,
@@ -632,54 +689,54 @@ app.controller('viewContainer', function($scope,$http) {
}
}
+
function cantLoadInitialData(response) {
PNotify.error({
- title: 'Unable to complete request',
- text: "Problem in connecting to server"
+ title: 'Unable to complete request',
+ text: "Problem in connecting to server"
});
}
-
+
}
-
- $scope.saveSettings = function(){
+
+ $scope.saveSettings = function () {
$('#containerSettingLoading').show();
url = "/docker/saveContainerSettings";
$scope.savingSettings = true;
-
+
var data = {
name: $scope.cName,
- memory:$scope.memory,
+ memory: $scope.memory,
startOnReboot: $scope.startOnReboot,
envConfirmation: $scope.envConfirmation,
envList: $scope.envList
};
-
+
console.log(data)
var config = {
- headers : {
+ headers: {
'X-CSRFToken': getCookie('csrftoken')
}
};
-
- $http.post(url, data,config).then(ListInitialData, cantLoadInitialData);
+
+ $http.post(url, data, config).then(ListInitialData, cantLoadInitialData);
function ListInitialData(response) {
if (response.data.saveSettingsStatus === 1) {
- if ($scope.envConfirmation){
+ if ($scope.envConfirmation) {
new PNotify({
title: 'Done. Redirecting...',
type: 'success'
});
location.reload();
}
- else{
+ else {
new PNotify({
title: 'Settings Saved',
type: 'success'
- });
- }
+ });
+ }
}
- else
- {
+ else {
new PNotify({
title: 'Unable to complete request',
text: response.data.error_message,
@@ -690,37 +747,38 @@ app.controller('viewContainer', function($scope,$http) {
$('#containerSettingLoading').hide();
$scope.savingSettings = false;
}
+
function cantLoadInitialData(response) {
new PNotify({
- title: 'Unable to complete request',
- text: "Problem in connecting to server",
- type: 'error'
+ title: 'Unable to complete request',
+ text: "Problem in connecting to server",
+ type: 'error'
});
$('#containerSettingLoading').hide();
$scope.savingSettings = false;
}
-
- if ($scope.startOnReboot === true){
- $scope.rPolicy="Yes";
+
+ if ($scope.startOnReboot === true) {
+ $scope.rPolicy = "Yes";
}
- else{
- $scope.rPolicy="No";
+ else {
+ $scope.rPolicy = "No";
}
-
+
}
-
- $scope.cAction = function(action){
+
+ $scope.cAction = function (action) {
$('#actionLoading').show();
console.log($scope.cName)
url = "/docker/doContainerAction";
var data = {name: $scope.cName, action: action};
var config = {
- headers : {
+ headers: {
'X-CSRFToken': getCookie('csrftoken')
}
};
-
- $http.post(url, data,config).then(ListInitialData, cantLoadInitialData);
+
+ $http.post(url, data, config).then(ListInitialData, cantLoadInitialData);
function ListInitialData(response) {
@@ -735,8 +793,7 @@ app.controller('viewContainer', function($scope,$http) {
$scope.status = response.data.status;
$scope.refreshStatus()
}
- else
- {
+ else {
new PNotify({
title: 'Unable to complete request',
text: response.data.error_message,
@@ -746,17 +803,18 @@ app.controller('viewContainer', function($scope,$http) {
}
$('#actionLoading').hide();
}
+
function cantLoadInitialData(response) {
PNotify.error({
- title: 'Unable to complete request',
- text: "Problem in connecting to server"
+ title: 'Unable to complete request',
+ text: "Problem in connecting to server"
});
$('#actionLoading').hide();
}
-
+
}
-
- $scope.loadLogs = function(name){
+
+ $scope.loadLogs = function (name) {
$scope.logs = "Loading...";
url = "/docker/getContainerLogs";
@@ -764,12 +822,12 @@ app.controller('viewContainer', function($scope,$http) {
var data = {name: name};
var config = {
- headers : {
+ headers: {
'X-CSRFToken': getCookie('csrftoken')
}
};
- $http.post(url, data,config).then(ListInitialData, cantLoadInitialData);
+ $http.post(url, data, config).then(ListInitialData, cantLoadInitialData);
function ListInitialData(response) {
@@ -778,31 +836,30 @@ app.controller('viewContainer', function($scope,$http) {
if (response.data.containerLogStatus === 1) {
$scope.logs = response.data.containerLog;
}
- else
- {
+ else {
$scope.logs = response.data.error_message;
}
}
+
function cantLoadInitialData(response) {
console.log("not good");
$scope.logs = "Error loading log";
}
- }
+ }
});
/* Java script code for docker image management */
-app.controller('manageImages', function($scope,$http) {
- $scope.tagList = [];
- $scope.showingSearch = false;
- $("#searchResult").hide();
-
- $scope.pullImage = function(image, tag){
+app.controller('manageImages', function ($scope, $http) {
+ $scope.tagList = [];
+ $scope.showingSearch = false;
+ $("#searchResult").hide();
+
+ $scope.pullImage = function (image, tag) {
function ListInitialDatas(response) {
- if (response.data.installImageStatus === 1)
- {
+ if (response.data.installImageStatus === 1) {
new PNotify({
title: 'Image pulled successfully',
text: 'Reloading...',
@@ -810,7 +867,7 @@ app.controller('manageImages', function($scope,$http) {
});
location.reload()
}
- else{
+ else {
new PNotify({
title: 'Failed to complete request',
text: response.data.error_message,
@@ -821,6 +878,7 @@ app.controller('manageImages', function($scope,$http) {
$('#imageLoading').hide();
}
+
function cantLoadInitialDatas(response) {
$('#imageLoading').hide();
new PNotify({
@@ -828,7 +886,8 @@ app.controller('manageImages', function($scope,$http) {
type: 'error'
});
}
- if (image && tag){
+
+ if (image && tag) {
$('#imageLoading').show();
url = "/docker/installImage";
@@ -837,34 +896,34 @@ app.controller('manageImages', function($scope,$http) {
tag: tag
};
var config = {
- headers : {
+ headers: {
'X-CSRFToken': getCookie('csrftoken')
}
};
- $http.post(url, data,config).then(ListInitialDatas, cantLoadInitialDatas);
+ $http.post(url, data, config).then(ListInitialDatas, cantLoadInitialDatas);
}
else {
new PNotify({
- title: 'Unable to complete request',
- text: 'Please select a tag',
- type: 'info'
- });
+ title: 'Unable to complete request',
+ text: 'Please select a tag',
+ type: 'info'
+ });
}
-
+
}
-
- $scope.searchImages = function(){
- console.log($scope.searchString);
- if (!$scope.searchString){
- $("#searchResult").hide();
- }
- else {
- $("#searchResult").show();
- }
+
+ $scope.searchImages = function () {
+ console.log($scope.searchString);
+ if (!$scope.searchString) {
+ $("#searchResult").hide();
+ }
+ else {
+ $("#searchResult").show();
+ }
clearTimeout(delayTimer);
- delayTimer = setTimeout(function() {
+ delayTimer = setTimeout(function () {
$('#imageLoading').show();
url = "/docker/searchImage";
@@ -872,20 +931,19 @@ app.controller('manageImages', function($scope,$http) {
string: $scope.searchString
};
var config = {
- headers : {
+ headers: {
'X-CSRFToken': getCookie('csrftoken')
}
};
- $http.post(url, data,config).then(ListInitialDatas, cantLoadInitialDatas);
+ $http.post(url, data, config).then(ListInitialDatas, cantLoadInitialDatas);
function ListInitialDatas(response) {
- if (response.data.searchImageStatus === 1)
- {
+ if (response.data.searchImageStatus === 1) {
$scope.images = response.data.matches;
console.log($scope.images)
}
- else{
+ else {
new PNotify({
title: 'Failed to complete request',
text: response.data.error,
@@ -896,6 +954,7 @@ app.controller('manageImages', function($scope,$http) {
$('#imageLoading').hide();
}
+
function cantLoadInitialDatas(response) {
$('#imageLoading').hide();
new PNotify({
@@ -904,36 +963,35 @@ app.controller('manageImages', function($scope,$http) {
});
}
}, 500);
- }
-
- function populateTagList(image, page){
- $('imageLoading').show();
+ }
+
+ function populateTagList(image, page) {
+ $('imageLoading').show();
url = "/docker/getTags"
var data = {
image: image,
- page: page+1
+ page: page + 1
};
var config = {
- headers : {
+ headers: {
'X-CSRFToken': getCookie('csrftoken')
- }
- };
- $http.post(url, data,config).then(ListInitialData, cantLoadInitialData);
+ }
+ };
+ $http.post(url, data, config).then(ListInitialData, cantLoadInitialData);
function ListInitialData(response) {
if (response.data.getTagsStatus === 1) {
- $scope.tagList[image].splice(-1,1);
+ $scope.tagList[image].splice(-1, 1);
$scope.tagList[image] = $scope.tagList[image].concat(response.data.list);
- if (response.data.next != null){
- $scope.tagList[image].push("Load more");
+ if (response.data.next != null) {
+ $scope.tagList[image].push("Load more");
}
}
- else
- {
+ else {
new PNotify({
title: 'Unable to complete request',
text: response.data.error_message,
@@ -942,6 +1000,7 @@ app.controller('manageImages', function($scope,$http) {
}
$('#imageLoading').hide();
}
+
function cantLoadInitialData(response) {
new PNotify({
title: 'Unable to complete request',
@@ -949,60 +1008,60 @@ app.controller('manageImages', function($scope,$http) {
type: 'error'
});
$('#imageLoading').hide();
- }
+ }
}
-
- $scope.runContainer = function(image){
+
+ $scope.runContainer = function (image) {
$("#errorMessage").hide();
if ($scope.imageTag[image] !== undefined) {
- $("#imageList").css("pointer-events","none");
+ $("#imageList").css("pointer-events", "none");
}
else {
$("#errorMessage").show();
$scope.errorMessage = "Please select a tag";
}
}
-
- $scope.loadTags = function(event){
+
+ $scope.loadTags = function (event) {
var pagesloaded = $(event.target).data('pageloaded');
var image = event.target.id;
-
+
if (!pagesloaded) {
$scope.tagList[image] = ['Loading...'];
- $(event.target).data('pageloaded',1);
-
+ $(event.target).data('pageloaded', 1);
+
populateTagList(image, pagesloaded);
// $("#"+image+" option:selected").prop("selected", false);
}
}
-
- $scope.selectTag = function(){
+
+ $scope.selectTag = function () {
var image = event.target.id;
- var selectedTag = $('#'+image).find(":selected").text();
-
+ var selectedTag = $('#' + image).find(":selected").text();
+
if (selectedTag == 'Load more') {
var pagesloaded = $(event.target).data('pageloaded');
- $(event.target).data('pageloaded', pagesloaded+1);
-
+ $(event.target).data('pageloaded', pagesloaded + 1);
+
populateTagList(image, pagesloaded);
}
}
-
- $scope.getHistory = function(counter){
- $('#imageLoading').show();
- var name = $("#"+counter).val()
-
- url = "/docker/getImageHistory";
+
+ $scope.getHistory = function (counter) {
+ $('#imageLoading').show();
+ var name = $("#" + counter).val()
+
+ url = "/docker/getImageHistory";
var data = {name: name};
var config = {
- headers : {
+ headers: {
'X-CSRFToken': getCookie('csrftoken')
}
};
- $http.post(url, data,config).then(ListInitialData, cantLoadInitialData);
+ $http.post(url, data, config).then(ListInitialData, cantLoadInitialData);
function ListInitialData(response) {
@@ -1012,8 +1071,7 @@ app.controller('manageImages', function($scope,$http) {
$('#history').modal('show');
$scope.historyList = response.data.history;
}
- else
- {
+ else {
new PNotify({
title: 'Unable to complete request',
text: response.data.error_message,
@@ -1022,6 +1080,7 @@ app.controller('manageImages', function($scope,$http) {
}
$('#imageLoading').hide();
}
+
function cantLoadInitialData(response) {
new PNotify({
title: 'Unable to complete request',
@@ -1030,11 +1089,11 @@ app.controller('manageImages', function($scope,$http) {
});
$('#imageLoading').hide();
}
- }
-
- $scope.rmImage = function(counter){
-
- (new PNotify({
+ }
+
+ $scope.rmImage = function (counter) {
+
+ (new PNotify({
title: 'Confirmation Needed',
text: 'Are you sure?',
icon: 'fa fa-question-circle',
@@ -1049,58 +1108,58 @@ app.controller('manageImages', function($scope,$http) {
history: {
history: false
}
- })).get().on('pnotify.confirm', function() {
- $('#imageLoading').show();
-
- if (counter == '0') {
- var name = 0;
- }
- else {
- var name = $("#"+counter).val()
- }
-
- url = "/docker/removeImage";
+ })).get().on('pnotify.confirm', function () {
+ $('#imageLoading').show();
- var data = {name: name};
-
- var config = {
- headers : {
- 'X-CSRFToken': getCookie('csrftoken')
+ if (counter == '0') {
+ var name = 0;
}
- };
-
- $http.post(url, data,config).then(ListInitialData, cantLoadInitialData);
-
-
- function ListInitialData(response) {
- console.log(response);
-
- if (response.data.removeImageStatus === 1) {
- new PNotify({
- title: 'Image(s) removed',
- type: 'success'
- });
- window.location.href = "/docker/manageImages";
+ else {
+ var name = $("#" + counter).val()
}
- else
- {
+
+ url = "/docker/removeImage";
+
+ var data = {name: name};
+
+ var config = {
+ headers: {
+ 'X-CSRFToken': getCookie('csrftoken')
+ }
+ };
+
+ $http.post(url, data, config).then(ListInitialData, cantLoadInitialData);
+
+
+ function ListInitialData(response) {
+ console.log(response);
+
+ if (response.data.removeImageStatus === 1) {
+ new PNotify({
+ title: 'Image(s) removed',
+ type: 'success'
+ });
+ window.location.href = "/docker/manageImages";
+ }
+ else {
+ new PNotify({
+ title: 'Unable to complete request',
+ text: response.data.error_message,
+ type: 'error'
+ });
+ }
+ $('#imageLoading').hide();
+ }
+
+ function cantLoadInitialData(response) {
new PNotify({
title: 'Unable to complete request',
text: response.data.error_message,
type: 'error'
});
+ $('#imageLoading').hide();
}
- $('#imageLoading').hide();
- }
- function cantLoadInitialData(response) {
- new PNotify({
- title: 'Unable to complete request',
- text: response.data.error_message,
- type: 'error'
- });
- $('#imageLoading').hide();
- }
-
+
})
- }
+ }
});
\ No newline at end of file
diff --git a/dockerManager/templates/dockerManager/install.html b/dockerManager/templates/dockerManager/install.html
index a3de1b5c9..802bde589 100644
--- a/dockerManager/templates/dockerManager/install.html
+++ b/dockerManager/templates/dockerManager/install.html
@@ -3,48 +3,64 @@
{% block title %}{% trans "Install Docker - CyberPanel" %}{% endblock %}
{% block content %}
-{% load static %}
-{% get_current_language as LANGUAGE_CODE %}
-
-
-
-
-
-
-
-{% trans "Install Docker" %}
-
- 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
literal 0
HcmV?d00001
diff --git a/static/serverStatus/serverStatus.js b/static/serverStatus/serverStatus.js
index 1a9b88863..c31727c0c 100644
--- a/static/serverStatus/serverStatus.js
+++ b/static/serverStatus/serverStatus.js
@@ -394,6 +394,7 @@ app.controller('servicesManager', function ($scope, $http) {
function ListInitialDatas(response) {
+ console.log(response.data)
if (response.data.status.litespeed) {
$scope.olsStatus = "Running";
@@ -409,8 +410,18 @@ app.controller('servicesManager', function ($scope, $http) {
$scope.olsStop = false;
}
- // Update SQL stats
+ if (response.data.status.docker) {
+ $scope.dockerStatus = "Running";
+ $scope.dockerStart = false;
+ $scope.dockerStop = true;
+ }
+ else {
+ $scope.dockerStatus = "Stopped";
+ $scope.dockerStart = true;
+ $scope.dockerStop = false;
+ }
+ // Update SQL stats
if (response.data.status.mysql) {
$scope.sqlStatus = "Running";
$scope.sqlStats = true;
@@ -468,7 +479,7 @@ app.controller('servicesManager', function ($scope, $http) {
}
- };
+ }
getServiceStatus();
$scope.serviceAction = function (serviceName, action) {
-
- {% trans "Install Docker" %}
-
{% endblock %}
\ No newline at end of file
diff --git a/dockerManager/views.py b/dockerManager/views.py
index 626c95146..0fbfebd16 100644
--- a/dockerManager/views.py
+++ b/dockerManager/views.py
@@ -1,11 +1,10 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
-from django.shortcuts import render,redirect
+from django.shortcuts import render, redirect, HttpResponse
from loginSystem.models import Administrator
from loginSystem.views import loadLoginPage
from plogical.container import ContainerManager
-from dockerManager.pluginManager import pluginManager
from decorators import preDockerRun
from plogical.acl import ACLManager
import json
@@ -22,7 +21,7 @@ def dockerPermission(request, userID, context):
else:
return ACLManager.loadError()
else:
- return None
+ return 0
@preDockerRun
def loadDockerHome(request):
@@ -41,22 +40,18 @@ def installDocker(request):
userID = request.session['userID']
perm = dockerPermission(request, userID, 'loadDockerHome')
if perm: return perm
- result = pluginManager.preDockerInstallation(request) # Later change to preInstallInstallation
- if result != 200:
- return result
+ cm = ContainerManager(userID, 'submitInstallDocker')
+ cm.start()
- cm = ContainerManager()
- coreResult = cm.submitInstallDocker(userID, json.loads(request.body))
+ data_ret = {'status': 1, 'error_message': 'None'}
+ json_data = json.dumps(data_ret)
+ return HttpResponse(json_data)
- result = pluginManager.postDockerInstallation(request, coreResult)
- if result != 200:
- return result
-
- return coreResult
-
- except KeyError:
- return redirect(loadLoginPage)
+ except BaseException, msg:
+ data_ret = {'status': 0, 'error_message': str(msg)}
+ json_data = json.dumps(data_ret)
+ return HttpResponse(json_data)
@preDockerRun
def installImage(request):
@@ -332,6 +327,7 @@ def manageImages(request):
def getImageHistory(request):
try:
userID = request.session['userID']
+
perm = dockerPermission(request, userID, 'loadDockerHome')
if perm: return perm
diff --git a/install/install.py b/install/install.py
index d1e941c24..8cbe2dcf5 100644
--- a/install/install.py
+++ b/install/install.py
@@ -780,8 +780,8 @@ class preFlightsChecks:
os.chdir(self.path)
- command = "wget http://cyberpanel.sh/CyberPanel.1.7.7.tar.gz"
- #command = "wget http://cyberpanel.sh/CyberPanelTemp.tar.gz"
+ #command = "wget http://cyberpanel.sh/CyberPanel.1.7.7.tar.gz"
+ command = "wget http://cyberpanel.sh/CyberPanelTemp.tar.gz"
preFlightsChecks.call(command, self.distro, '[download_install_CyberPanel]',
'CyberPanel Download',
1, 1, os.EX_OSERR)
@@ -789,8 +789,8 @@ class preFlightsChecks:
##
count = 0
- command = "tar zxf CyberPanel.1.7.7.tar.gz"
- #command = "tar zxf CyberPanelTemp.tar.gz"
+ #command = "tar zxf CyberPanel.1.7.7.tar.gz"
+ command = "tar zxf CyberPanelTemp.tar.gz"
preFlightsChecks.call(command, self.distro, '[download_install_CyberPanel]',
'Extract CyberPanel',1, 1, os.EX_OSERR)
@@ -2667,27 +2667,15 @@ class preFlightsChecks:
return 0
def installPYDNS(self):
- try:
- count = 0
- while (1):
- command = "pip install pydns"
-
- res = subprocess.call(shlex.split(command))
-
- if preFlightsChecks.resFailed(self.distro, res):
- count = count + 1
- preFlightsChecks.stdOut(
- "Trying to install pydns, trying again, try number: " + str(count))
- if count == 3:
- logging.InstallLog.writeToFile(
- "Failed to install pydns! [installTLDExtract]")
- else:
- logging.InstallLog.writeToFile("pydns successfully installed! [pip]")
- preFlightsChecks.stdOut("pydns successfully installed! [pip]")
- break
- except OSError, msg:
- logging.InstallLog.writeToFile(str(msg) + " [installTLDExtract]")
- return 0
+ command = "pip install pydns"
+ preFlightsChecks.call(command, self.distro, '[installPYDNS]',
+ 'Install PYDNS',
+ 1, 0, os.EX_OSERR)
+ def installDockerPY(self):
+ command = "pip install docker"
+ preFlightsChecks.call(command, self.distro, '[installDockerPY]',
+ 'Install DockerPY',
+ 1, 0, os.EX_OSERR)
def installOpenDKIM(self):
try:
@@ -3289,6 +3277,7 @@ def main():
checks.installCertBot()
checks.test_Requests()
checks.installPYDNS()
+ checks.installDockerPY()
checks.download_install_CyberPanel(installCyberPanel.InstallCyberPanel.mysqlPassword, mysql)
checks.setupCLI()
checks.setup_cron()
diff --git a/plogical/acl.py b/plogical/acl.py
index a3a9d76ee..9d29de4f3 100644
--- a/plogical/acl.py
+++ b/plogical/acl.py
@@ -453,7 +453,6 @@ class ACLManager:
@staticmethod
def checkContainerOwnership(name, userID):
- return 1
try:
container = Containers.objects.get(name=name)
currentACL = ACLManager.loadedACL(userID)
@@ -513,7 +512,7 @@ class ACLManager:
for items in admins:
cons = items.containers_set.all()
for con in cons:
- containerList.append(web)
+ containerList.append(con)
return containerList
diff --git a/plogical/container.py b/plogical/container.py
index 764d695d7..dd77b252d 100644
--- a/plogical/container.py
+++ b/plogical/container.py
@@ -18,54 +18,88 @@ import subprocess
import shlex
import time
from dockerManager.models import Containers
-from django.http import StreamingHttpResponse
-from wsgiref.util import FileWrapper
from math import ceil
import docker
import docker.utils
import requests
+from processUtilities import ProcessUtilities
+from serverStatus.serverStatusUtil import ServerStatusUtil
+import threading as multi
# Use default socket to connect
-class ContainerManager:
- def __init__(self, name=None):
- self.name = name
+class ContainerManager(multi.Thread):
- def submitInstallDocker(self, userID=None, data=None):
+ def __init__(self, name=None, function=None):
+ multi.Thread.__init__(self)
+ self.name = name
+ self.function = function
+
+ def run(self):
try:
- currentACL = ACLManager.loadedACL(userID)
+ if self.function == 'submitInstallDocker':
+ self.submitInstallDocker()
+ elif self.function == 'restartGunicorn':
+ command = 'sudo systemctl restart gunicorn.socket'
+ ProcessUtilities.executioner(command)
+ except BaseException, msg:
+ logging.CyberCPLogFileWriter.writeToFile( str(msg) + ' [ContainerManager.run]')
+
+ @staticmethod
+ def executioner(command, statusFile):
+ try:
+ res = subprocess.call(shlex.split(command), stdout=statusFile, stderr=statusFile)
+ if res == 1:
+ return 0
+ else:
+ return 1
+ except BaseException, msg:
+ logging.CyberCPLogFileWriter.writeToFile(str(msg))
+ return 0
+
+ def submitInstallDocker(self):
+ try:
+ currentACL = ACLManager.loadedACL(self.name)
+
if ACLManager.currentContextPermission(currentACL, 'createContainer') == 0:
return ACLManager.loadError()
- command = 'sudo yum install -y docker'
- cmd = shlex.split(command)
- res = subprocess.call(cmd)
+ statusFile = open(ServerStatusUtil.lswsInstallStatusPath, 'w')
+
+ logging.CyberCPLogFileWriter.statusWriter(ServerStatusUtil.lswsInstallStatusPath,
+ "Starting Docker Installation..\n", 1)
+
+ if ProcessUtilities.decideDistro() == ProcessUtilities.centos:
+ command = 'sudo yum install -y docker'
+ else:
+ command = 'sudo DEBIAN_FRONTEND=noninteractive apt-get install -y docker.io'
+
+ if not ServerStatusUtil.executioner(command, statusFile):
+ logging.CyberCPLogFileWriter.statusWriter(ServerStatusUtil.lswsInstallStatusPath,
+ "Failed to install Docker. [404]\n", 1)
+ return 0
+
command = 'sudo groupadd docker'
- cmd = shlex.split(command)
- res2 = subprocess.call(cmd)
+ ServerStatusUtil.executioner(command, statusFile)
command = 'sudo usermod -aG docker cyberpanel'
- cmd = shlex.split(command)
- res3 = subprocess.call(cmd)
+ ServerStatusUtil.executioner(command, statusFile)
- command = 'sudo service docker start'
- cmd = shlex.split(command)
- res4 = subprocess.call(cmd)
+ command = 'sudo systemctl enable docker'
+ ServerStatusUtil.executioner(command, statusFile)
- if res == 0 and res2 == 0 and res3 == 0 and res4 == 0:
- data_ret = {'installDockerStatus': 1, 'error_message': 'None'}
- json_data = json.dumps(data_ret)
- return HttpResponse(json_data)
- else:
- data_ret = {'installDockerStatus': 0, 'error_message': 'Failed to install. Manual install required.'}
- json_data = json.dumps(data_ret)
- return HttpResponse(json_data)
+ command = 'sudo systemctl start docker'
+ ServerStatusUtil.executioner(command, statusFile)
- return HttpResponse(res)
+ cm = ContainerManager(self.name, 'restartGunicorn')
+ cm.start()
+
+ logging.CyberCPLogFileWriter.statusWriter(ServerStatusUtil.lswsInstallStatusPath,
+ "Docker successfully installed.[200]\n", 1)
except BaseException, msg:
- return HttpResponse(str(msg))
+ logging.CyberCPLogFileWriter.statusWriter(ServerStatusUtil.lswsInstallStatusPath, str(msg) + ' [404].', 1)
def createContainer(self, request=None, userID=None, data=None):
try:
@@ -779,9 +813,6 @@ class ContainerManager:
name = data['name']
- if ACLManager.checkContainerOwnership(name, userID) != 1:
- return ACLManager.loadError()
-
client = docker.from_env()
dockerAPI = docker.APIClient()
@@ -808,6 +839,7 @@ class ContainerManager:
def removeImage(self, userID=None, data=None):
try:
admin = Administrator.objects.get(pk=userID)
+
if admin.acl.adminStatus != 1:
return ACLManager.loadError()
diff --git a/plogical/modSec.py b/plogical/modSec.py
index 92f2d784b..26e67dd95 100644
--- a/plogical/modSec.py
+++ b/plogical/modSec.py
@@ -21,7 +21,10 @@ class modSec:
mailUtilities.checkHome()
- command = 'sudo yum install ols-modsecurity -y'
+ if ProcessUtilities.decideDistro() == ProcessUtilities.centos:
+ command = 'sudo yum install ols-modsecurity -y'
+ else:
+ command = 'sudo DEBIAN_FRONTEND=noninteractive apt-get install ols-modsecurity -y'
cmd = shlex.split(command)
diff --git a/plogical/upgrade.py b/plogical/upgrade.py
index 2894dfedc..72c75a9de 100644
--- a/plogical/upgrade.py
+++ b/plogical/upgrade.py
@@ -599,6 +599,40 @@ WantedBy=multi-user.target"""
except:
pass
+ @staticmethod
+ def dockerMigrations():
+ try:
+ connection, cursor = Upgrade.setupConnection('cyberpanel')
+
+
+ query = """CREATE TABLE `dockerManager_containers` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `name` varchar(50) NOT NULL,
+ `cid` varchar(64) NOT NULL,
+ `image` varchar(50) NOT NULL,
+ `tag` varchar(50) NOT NULL,
+ `memory` int(11) NOT NULL,
+ `ports` longtext NOT NULL,
+ `env` longtext NOT NULL,
+ `startOnReboot` int(11) NOT NULL,
+ `admin_id` int(11) NOT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `name` (`name`),
+ KEY `dockerManager_contai_admin_id_58fb62b7_fk_loginSyst` (`admin_id`),
+ CONSTRAINT `dockerManager_contai_admin_id_58fb62b7_fk_loginSyst` FOREIGN KEY (`admin_id`) REFERENCES `loginSystem_administrator` (`id`)
+)"""
+ try:
+ cursor.execute(query)
+ except:
+ pass
+
+ try:
+ connection.close()
+ except:
+ pass
+ except:
+ pass
+
@staticmethod
def enableServices():
try:
@@ -854,6 +888,7 @@ WantedBy=multi-user.target"""
Upgrade.mailServerMigrations()
Upgrade.emailMarketingMigrationsa()
+ Upgrade.dockerMigrations()
##
diff --git a/static/images/docker.png b/static/images/docker.png
new file mode 100644
index 0000000000000000000000000000000000000000..cdf0c6fc2bd8435349232031bfb4c7842bcc9e5e
GIT binary patch
literal 4205
zcmZu!cQhMr+fMAgV$~?6wQ5w2nvu2$YQ(6Pnm;9^LR(s5#wfK%OKqtc6s1N{qf~7|
zf{GTUv19M~>ieGWJKuNC`<(kZ&vjkrzR$V;dhY9vf*C`Z8Tc3g006VTp0*hP0EAs!
zAv($nMOek-LI4!P3@vn^PYr31h5rfKkdFVwe}Q-9|D*qtb|KORG|^|RUI6;HGjxf>
z^Yinqtu5N{9$HjAed-*2`XZfo1zilD?#&b}`m2%6V;Xq&-oar&WnbI;;pb6OX#dWg
z#D>cSYonyKIr3IQ(@1^GSI5>ZvEYw|J-?L8*KBh;ptYM3iK#BnQI|4i<`L?(7Y&2F
z&5X?fYz~;24K$?f_YIuzOd{;#(?wIT;V}Tf`dDB4wuLW|oIUYRz8XgakS0q0_*?v(
z(waWpB-hv{S9Sf|)v1kF-<9&Nh~6nrLseAy(6tha!enViDvA(@FdN-}eF*t3EfxT5
z`G$=YfC>U!qzXBUDLx0_1|gNcjWielC)${2k?c2cLXF`8HqW0@|CK0UY=FPuqCny=
zsL{e?jz%9cLgXkIhQ$C35U99Le0G^|*Pdqu04owUq4V#ej*w`tRa-kCCizlR-*qGy
z{0s>oiozx{{dv)Qw1k0ap-FQpsqQKtRN-zc??8+3A8g
- {% trans "Install Docker" %} 
-
-
-
- {% if conErr == 1%}
-
- {% if status == 1 %}
- {% trans "Unable to connect to docker daemon, please try restarting docker from service page" %}
- {% else %}
- {% trans "You do not have sufficient permissions to access this page" %}
- {% endif %}
-
- {% else %}
-
- {% if status == 1 %} - - {% else %} - {% trans "You do not have permissions to install Docker. Please contact your system administrator" %} - {% endif %} - {% endif %} + {% load static %} + {% get_current_language as LANGUAGE_CODE %} + +
-
-
-
-{% trans "Docker is currently not installed on this server. To manage containers, you must first install it." %}
-- {% if status == 1 %} - - {% else %} - {% trans "You do not have permissions to install Docker. Please contact your system administrator" %} - {% endif %} - {% endif %} + {% load static %} + {% get_current_language as LANGUAGE_CODE %} + +
+
-
+
+
+
+ {% trans "Install Docker" %}
+
+
+
+
+ {% trans "Install Docker" %}
+
+
+ {% trans "Install Docker" %}
+
+
+
+ {% if conErr == 1 %}
+
+ {% if status == 1 %}
+ {% trans "Unable to connect to docker daemon, please try restarting docker from service page" %}
+ {% else %}
+ {% trans "You do not have sufficient permissions to access this page" %}
+ {% endif %}
+
+ {% else %}
+
+ {% if status == 1 %} + + {% else %} + {% trans "You do not have permissions to install Docker. Please contact your system administrator" %} + {% endif %} + {% endif %} + +
+ {% trans "Docker is currently not installed on this server. To manage containers, you must first install it." %}
+ + +
+
+
+
+
+
+
+ + {% if status == 1 %} + + {% else %} + {% trans "You do not have permissions to install Docker. Please contact your system administrator" %} + {% endif %} + {% endif %} + +