From 58721b91faac70067fdf4dcdab5f977f003c8c8a Mon Sep 17 00:00:00 2001 From: usmannasir Date: Sat, 3 Feb 2024 15:04:19 +0500 Subject: [PATCH] docker install function --- plogical/DockerSites.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/plogical/DockerSites.py b/plogical/DockerSites.py index 7b0851d0b..19e1663c3 100644 --- a/plogical/DockerSites.py +++ b/plogical/DockerSites.py @@ -4,6 +4,8 @@ import os import sys import time + + sys.path.append('/usr/local/CyberCP') import django @@ -12,6 +14,7 @@ try: from plogical.acl import ACLManager except: pass +from dockerManager.dockerInstall import DockerInstall from plogical.processUtilities import ProcessUtilities from plogical.CyberCPLogFileWriter import CyberCPLogFileWriter as logging import argparse @@ -174,10 +177,7 @@ REWRITERULE ^(.*)$ HTTP://docker{port}/$1 [P] result = ProcessUtilities.outputExecutioner(command) print(f'return code of docker install {result}') if result.find("not found") > -1: - status, message = self.InstallDocker() - if status == 0: - logging.statusWriter(self.JobID, 'Failed to installed docker. [404]') - return 0, message + DockerInstall.submitInstallDocker() logging.statusWriter(self.JobID, 'Docker is ready to use..,10') @@ -662,10 +662,7 @@ services: result = ProcessUtilities.outputExecutioner(command) print(f'return code of docker install {result}') if result.find("not found") > -1: - status, message = self.InstallDocker() - if status == 0: - logging.statusWriter(self.JobID, 'Failed to installed docker. [404]') - return 0, message + DockerInstall.submitInstallDocker() logging.statusWriter(self.JobID, 'Docker is ready to use..,10')