almet/dangerzone
1
0
Fork 0
mirror of https://github.com/freedomofpress/dangerzone.git synced 2025-04-29 10:12:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

FIXUP: Respect custom tags

Browse source
This commit is contained in:
Alex Pyrgiotis 2025-02-06 14:37:21 +02:00
parent 81905dc7bc
commit 1d5dc73610
No known key found for this signature in database
GPG key ID: B6C15EBA0357C9AA
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
install/common/build-image.py
View file

@ -101,13 +101,8 @@ def main():
print(f"Building for architecture '{ARCH}'") print(f"Building for architecture '{ARCH}'")
tag = args.tag or determine_git_tag() tag = args.tag or determine_git_tag()
image_name_tagged = IMAGE_NAME + ":" + tag date = f"{args.debian_archive_date}-" if args.debian_archive_date and not args.tag else ""
build_args = [] image_name_tagged = IMAGE_NAME + ":" + date + tag
if args.debian_archive_date:
print(f"Using Debian archive snapshot date '{args.debian_archive_date}'")
build_args = ["--build-arg", f"DEBIAN_ARCHIVE_DATE={args.debian_archive_date}"]
image_name_tagged = f"{args.debian_archive_date}-{image_name_tagged}"
print(f"Will tag the container image as '{image_name_tagged}'") print(f"Will tag the container image as '{image_name_tagged}'")
with open(image_id_path, "w") as f: with open(image_id_path, "w") as f:
@ -117,6 +112,10 @@ def main():
print("Building container image") print("Building container image")
cache_args = [] if args.use_cache else ["--no-cache"] cache_args = [] if args.use_cache else ["--no-cache"]
platform_args = [] if not args.platform else ["--platform", args.platform] platform_args = [] if not args.platform else ["--platform", args.platform]
build_args = []
if args.debian_archive_date:
build_args = ["--build-arg", f"DEBIAN_ARCHIVE_DATE={args.debian_archive_date}"]
subprocess.run( subprocess.run(
[ [
args.runtime, args.runtime,