almet/dangerzone
1
0
Fork 0
mirror of https://github.com/freedomofpress/dangerzone.git synced 2025-04-30 18:52:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Provide the VM with the correct container name

Browse source
This commit is contained in:
Micah Lee 2021-07-01 17:34:48 -07:00
parent a7f3eb9b43
commit 5493292ba2
No known key found for this signature in database
GPG key ID: 403C2657CD994F73
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
dangerzone/container.py
View file

@ -59,7 +59,7 @@ def exec_vm(args, vm_info):
"-i", "-i",
vm_info["client_key_path"], vm_info["client_key_path"],
"-p", "-p",
vm_info["tunnel_port"], str(vm_info["tunnel_port"]),
"-o", "-o",
"StrictHostKeyChecking=no", "StrictHostKeyChecking=no",
"user@127.0.0.1", "user@127.0.0.1",
@ -114,6 +114,9 @@ def container_main():
@click.option("--container-name", default="docker.io/flmcode/dangerzone") @click.option("--container-name", default="docker.io/flmcode/dangerzone")
def ls(vm_info_path, container_name): def ls(vm_info_path, container_name):
"""docker image ls [container_name]""" """docker image ls [container_name]"""
if vm_info_path:
container_name = "localhost/dangerzone"
sys.exit( sys.exit(
exec_container(["image", "ls", container_name]), load_vm_info(vm_info_path) exec_container(["image", "ls", container_name]), load_vm_info(vm_info_path)
) )
@ -131,6 +134,7 @@ def documenttopixels(vm_info_path, document_filename, pixel_dir, container_name)
document_dir = os.path.dirname(document_filename) document_dir = os.path.dirname(document_filename)
if vm_info: if vm_info:
container_name = "localhost/dangerzone"
normalized_document_dir = mount_vm(document_dir, vm_info) normalized_document_dir = mount_vm(document_dir, vm_info)
normalized_document_filename = os.path.join( normalized_document_filename = os.path.join(
normalized_document_dir, os.path.basename(document_filename) normalized_document_dir, os.path.basename(document_filename)
@ -176,6 +180,7 @@ def pixelstopdf(vm_info_path, pixel_dir, safe_dir, container_name, ocr, ocr_lang
vm_info = load_vm_info(vm_info_path) vm_info = load_vm_info(vm_info_path)
if vm_info: if vm_info:
container_name = "localhost/dangerzone"
normalized_pixel_dir = mount_vm(pixel_dir, vm_info) normalized_pixel_dir = mount_vm(pixel_dir, vm_info)
normalized_safe_dir = mount_vm(safe_dir, vm_info) normalized_safe_dir = mount_vm(safe_dir, vm_info)
else: else: