michael.heier/citadel-core
1
0
Fork 1
mirror of https://github.com/runcitadel/core.git synced 2024-11-11 16:30:38 +00:00
Code Issues Projects Releases Wiki Activity

WIP: Full virtual apps implementation

Browse Source
This commit is contained in:
AaronDewes 2022-10-01 13:23:57 +00:00
parent 90a3beab0c
commit 908ca91395
2 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/app-manager.py
View File

@ -97,6 +97,16 @@ elif args.action == 'install':
if not args.app:
print("No app provided")
exit(1)
with open(os.path.join(appsDir, "virtual-apps.json"), "r") as f:
virtual_apps = json.load(f)
userData = getUserData()
for virtual_app in virtual_apps.keys():
implementations = virtual_apps[virtual_app]
if args.app in implementations:
for implementation in implementations:
if "installedApps" in userData and implementation in userData["installedApps"]:
print("Another implementation of {} is already installed: {}. Uninstall it first to install this app.".format(implementation))
exit(0)
createDataDir(args.app)
compose(args.app, "pull")
compose(args.app, "up --detach")

25
app/lib/manage.py
View File

@ -51,10 +51,18 @@ def getArguments():
arguments += argv[i] + " "
return arguments
def get_var(var_name):
def get_var_safe(var_name):
dotenv = parse_dotenv(os.path.join(nodeRoot, ".env"))
if var_name in dotenv:
return str(dotenv[var_name])
else:
print("Error: {} is not defined!".format(var_name))
return False
def get_var(var_name):
var_value = get_var_safe(var_name)
if var_value:
return var_value
else:
print("Error: {} is not defined!".format(var_name))
exit(1)
@ -178,8 +186,21 @@ def getUserData():
def compose(app, arguments):
if not os.path.isdir(os.path.join(appsDir, app)):
print("Warning: App {} doesn't exist on Citadel".format(app))
print("Warning: App {} doesn't exist on this node!".format(app))
return
virtual_apps = {}
with open(os.path.join(appsDir, "virtual-apps.json"), "r") as f:
virtual_apps = json.load(f)
userData = getUserData()
for virtual_app in virtual_apps.keys():
implementations = virtual_apps[virtual_app]
for implementation in implementations:
if "installedApps" in userData and implementation in userData["installedApps"]:
if get_var_safe("APP_{}_SERVICE_IP".format(implementation)):
os.environ["APP_{}_IP".format(virtual_app)] = get_var_safe("APP_{}_SERVICE_IP".format(implementation)) # type: ignore
if get_var_safe("APP_{}_SERVICE_PORT".format(implementation)):
os.environ["APP_{}_PORT".format(virtual_app)] = get_var_safe("APP_{}_SERVICE_PORT".format(implementation)) # type: ignore
break
# Runs a compose command in the app dir
# Before that, check if a docker-compose.yml exists in the app dir
composeFile = os.path.join(appsDir, app, "docker-compose.yml")