roxxers/abra
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use abra's vendored copy of yq instead of system

Browse Source
This commit is contained in:
3wc 2021-04-03 15:44:13 +02:00
parent fbb1081ed5
commit 0206279894
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bin/app-json.py
View File

@ -20,6 +20,7 @@ from requests import get
HOME_PATH = expanduser("~/") HOME_PATH = expanduser("~/")
CLONES_PATH = Path(f"{HOME_PATH}/.abra/apps").absolute() CLONES_PATH = Path(f"{HOME_PATH}/.abra/apps").absolute()
YQ_PATH = Path(f"{HOME_PATH}/.abra/vendor/yq")
SCRIPT_PATH = Path(__file__).absolute().parent SCRIPT_PATH = Path(__file__).absolute().parent
REPOS_TO_SKIP = ( REPOS_TO_SKIP = (
"abra", "abra",
@ -179,7 +180,7 @@ def get_app_versions(app_path, cached_apps_json):
for tag in tags: for tag in tags:
_run_cmd(f"git checkout {tag}") _run_cmd(f"git checkout {tag}")
services_cmd = "yq e '.services | keys | .[]' compose*.yml" services_cmd = f"{YQ_PATH} e '.services | keys | .[]' compose*.yml"
services = _run_cmd(services_cmd, shell=True).split() services = _run_cmd(services_cmd, shell=True).split()
parsed_services = [] parsed_services = []
@ -199,7 +200,7 @@ def get_app_versions(app_path, cached_apps_json):
log.info(f"Skipped {service} asa we've already parsed it locally") log.info(f"Skipped {service} asa we've already parsed it locally")
continue continue
services_cmd = f"yq e '.services.{service}.image' compose*.yml" services_cmd = f"{YQ_PATH} e '.services.{service}.image' compose*.yml"
images = _run_cmd(services_cmd, shell=True).split() images = _run_cmd(services_cmd, shell=True).split()
for image in images: for image in images: