From 9f69532dca359a5a70d6006c34d37bb02c1bfa58 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Sat, 5 Jun 2021 08:57:35 +0200 Subject: [PATCH] Use vendored JQ --- bin/abralib.py | 1 + bin/app-json.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/bin/abralib.py b/bin/abralib.py index fa202f5..95d59dc 100644 --- a/bin/abralib.py +++ b/bin/abralib.py @@ -33,6 +33,7 @@ REPOS_TO_SKIP = ( "swarm-cronjob", ) YQ_PATH = Path(f"{HOME_PATH}/.abra/vendor/yq") +JQ_PATH = Path(f"{HOME_PATH}/.abra/vendor/jq") log = getLogger(__name__) basicConfig() diff --git a/bin/app-json.py b/bin/app-json.py index f784ff5..ff3fdc4 100755 --- a/bin/app-json.py +++ b/bin/app-json.py @@ -16,6 +16,7 @@ from requests import get from abralib import ( CLONES_PATH, + JQ_PATH, REPOS_TO_SKIP, YQ_PATH, _run_cmd, @@ -171,7 +172,7 @@ def get_app_versions(app_path, cached_apps_json): if image in ("null", "---"): continue - images_cmd = f"skopeo inspect docker://{image} | jq '.Digest'" + images_cmd = f"skopeo inspect docker://{image} | {JQ_PATH} '.Digest'" output = _run_cmd(images_cmd, shell=True) service_version_info = {