Nemcio/CyberPanel
1
0
Fork 0
mirror of https://github.com/usmannasir/cyberpanel.git synced 2025-11-15 17:56:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

n8n container deployment improvement

Browse Source
This commit is contained in:
usmannasir
2025-04-09 15:18:31 +05:00
parent a74a6a52a9
commit b02a216f5f
1 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
plogical/DockerSites.py
View File

@@ -791,6 +791,9 @@ services:
'proxy_configured': False 'proxy_configured': False
} }
# Setup service name first
self.data['ServiceName'] = self.data["SiteName"].replace(' ', '-')
# Validate environment variables # Validate environment variables
self.validate_environment() self.validate_environment()
logging.statusWriter(self.JobID, 'Environment validation completed..,5') logging.statusWriter(self.JobID, 'Environment validation completed..,5')
@@ -810,9 +813,6 @@ services:
self.containerState['docker_installed'] = True self.containerState['docker_installed'] = True
logging.statusWriter(self.JobID, 'Docker is ready to use..,15') logging.statusWriter(self.JobID, 'Docker is ready to use..,15')
# Setup service name
self.data['ServiceName'] = self.data["SiteName"].replace(' ', '-')
# Generate Docker Compose configuration # Generate Docker Compose configuration
compose_config = f''' compose_config = f'''
version: '3.8' version: '3.8'
@@ -996,15 +996,32 @@ tar -czf /home/docker/{self.data['finalURL']}/backups/n8n_$(date +%Y%m%d).tar.gz
print(str(msg)) print(str(msg))
def validate_environment(self): def validate_environment(self):
"""
Validate required environment variables
"""
required_vars = [ required_vars = [
'MySQLDBName', 'MySQLDBNUser', 'MySQLPassword', 'MySQLDBName', 'MySQLDBNUser', 'MySQLPassword',
'finalURL', 'port', 'ServiceName', 'adminUser', 'finalURL', 'port', 'SiteName', 'adminUser',
'CPUsMySQL', 'MemoryMySQL', 'CPUsSite', 'MemorySite' 'CPUsMySQL', 'MemoryMySQL', 'CPUsSite', 'MemorySite'
] ]
for var in required_vars: for var in required_vars:
if var not in self.data or not self.data[var]: if var not in self.data or not self.data[var]:
raise Exception(f"Missing required environment variable: {var}") raise Exception(f"Missing required environment variable: {var}")
# Validate numeric values
numeric_vars = ['CPUsMySQL', 'MemoryMySQL', 'CPUsSite', 'MemorySite']
for var in numeric_vars:
try:
float(self.data[var])
except (ValueError, TypeError):
raise Exception(f"Invalid numeric value for {var}: {self.data[var]}")
# Validate minimum memory requirements
if int(self.data['MemoryMySQL']) < 256:
raise Exception("Minimum MySQL memory requirement is 256MB")
if int(self.data['MemorySite']) < 256:
raise Exception("Minimum site memory requirement is 256MB")
def cleanup(self): def cleanup(self):
try: try: