From f3ba780790f5a102d91ca67bb1119c92cc70887e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20K=C3=BCffner?= <11882946+mkuf@users.noreply.github.com> Date: Tue, 12 Nov 2024 08:30:12 +0100 Subject: [PATCH] scripts: build: check if targets are found; fix casing for target search --- scripts/build/build.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/scripts/build/build.py b/scripts/build/build.py index 67a7c5e..5966035 100644 --- a/scripts/build/build.py +++ b/scripts/build/build.py @@ -80,17 +80,22 @@ with open(dockerfile) as file: build["upstream"] = repo[0].split('=')[1] # build targets - target = re.findall(r'FROM .* as .*', line) + target = re.findall(r'FROM .* AS .*', line) if target: if not "build" in target[0]: build["targets"].append(target[0].split(' as ')[-1]) -logger.info("Found upstream repository: " + build["upstream"]) -logger.info("Found docker targets: " + str(build["targets"])) - if args.upstream: logger.warning("Upstream Repo has been overwritten to: " + args.upstream ) build["upstream"] = args.upstream +else: + logger.info("Found upstream repository: " + build["upstream"]) + +if len(build["targets"]) < 1: + logger.error("No targets found. Nothing to build") + sys.exit(1) +else: + logger.info("Found docker targets: " + str(build["targets"])) #--- # populate version dict