ExternalVendorCode/gns3-registry
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-registry.git synced 2025-01-18 18:56:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #782 from b-ehlers/build

Browse Source 
Docker build: Cleanup on image rebuilds
This commit is contained in:
Jeremy Grossmann 2023-06-25 09:11:20 +09:30 committed by GitHub
commit 0cba6bd82a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
.github/bin/docker_build vendored
View File

@ -103,7 +103,7 @@ RE_REPOSITORY = re.compile(r'''
''', re.VERBOSE) ''', re.VERBOSE)
def parse_repository(repository): def parse_repository(repository):
""" extract registry, user, repo and tag from repository """ """ extract registry, repo and tag from repository """
# verify repository format and extract components # verify repository format and extract components
match = RE_REPOSITORY.fullmatch(repository) match = RE_REPOSITORY.fullmatch(repository)
if not match: if not match:
@ -284,7 +284,7 @@ def get_images(image_file):
def init_image_info(): def init_image_info():
""" initialize base image data structure """ """ initialize image info structure """
image_info["scratch"] = None image_info["scratch"] = None
image_info["NONE"] = None image_info["NONE"] = None
@ -304,7 +304,7 @@ def needs_rebuild(image, default_repository=None):
full_name = full_image_name(image["name"], default_repository) full_name = full_image_name(image["name"], default_repository)
base_name, _ = expand_base_image(image["base"], full_name) base_name, _ = expand_base_image(image["base"], full_name)
# update base_image information, if empty # update information of base image, if empty
if base_name not in image_info: if base_name not in image_info:
_, layers = get_time_layers(base_name) _, layers = get_time_layers(base_name)
# store last layer # store last layer
@ -442,28 +442,24 @@ for iname in args.image:
# rebuild images # rebuild images
for img in images: for img in images:
# pragma pylint: disable=invalid-name # pragma pylint: disable=invalid-name
if "/" in img["name"]: # full image name
base_repositories = [None]
else: # name-only image name
if not docker_repositories:
sys.exit(f"{img['name']}: "
"Environment variable DOCKER_REPOSITORY is not defined")
base_repositories = docker_repositories
reason = False reason = False
if xor(args.all, img["name"] in args.image or img["base"] in args.image): if xor(args.all, img["name"] in args.image or img["base"] in args.image):
reason = "Rebuild triggered by command line" reason = "Rebuild triggered by command line"
if "/" in img["name"]: else: # check if image needs rebuilding
# full target image name for docker_repo in base_repositories:
reason = reason or needs_rebuild(img) reason = needs_rebuild(img, docker_repo)
if reason:
print(f"*** {img['name']}\nReason: {reason}\n")
if not args.dry_run:
build(img)
else:
# name-only target image name
if not docker_repositories:
sys.exit("Environment variable DOCKER_REPOSITORY is not defined")
build_repositories = []
for docker_idx, docker_repo in enumerate(docker_repositories):
reason = reason or needs_rebuild(img, docker_repo)
if reason: if reason:
build_repositories = docker_repositories[docker_idx:] + \
docker_repositories[:docker_idx]
break break
for docker_repo in build_repositories: if reason: # rebuild image
print(f"*** {docker_repo}/{img['name']}\nReason: {reason}\n") for docker_repo in base_repositories:
print(f"*** {full_image_name(img['name'], docker_repo)}\n"
f"Reason: {reason}\n")
if not args.dry_run: if not args.dry_run:
build(img, docker_repo) build(img, docker_repo)