Skip to content

[WIP] Update the containerutils function to handle new docker tls argument #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hendersonreed wants to merge 2 commits into
base: main
Choose a base branch
from
Open

[WIP] Update the containerutils function to handle new docker tls argument #29

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0ef477
Update the containerutils function to handle new docker tls argument
Feb 11, 2022
189c2e2
Merge remote-tracking branch 'origin/main' into update-containerutils…
Mar 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 18 additions & 13 deletions galaxykit/containerutils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,12 @@ def __init__(
if auth: # we only need to auth if creds are supplied
self.login(*auth, fail_ok=True)

def add_tls_verify_arg(self, run_args):
if self.engine == "podman":
run_args.append(f"--tls-verify={self.tls_verify}")
if self.engine == "docker":
run_args.append(f"--tlsverify={self.tls_verify}")

def login(self, username, password, fail_ok=False):
run_args = [
self.engine,
Expand All @@ -50,10 +56,9 @@ def login(self, username, password, fail_ok=False):
"--password",
password,
]
if self.engine == "podman":
run_args.append(f"--tls-verify={self.tls_verify}")
self.add_tls_verify_arg(run_args)
try:
run(run_args)
return run(run_args)
except FileNotFoundError:
if fail_ok:
logger.warn(f"Container engine '{self.engine}' not found.")
Expand All @@ -64,10 +69,13 @@ def pull_image(self, image_name):
"""
pull an image from the configured default registry
"""
if self.engine == "podman" and not self.tls_verify:
run([self.engine, "pull", self.registry + image_name, "--tls-verify=False"])
else:
run([self.engine, "pull", self.registry + image_name])
run_args = [
self.engine,
"pull",
self.registry + image_name,
]
self.add_tls_verify_arg(run_args)
return run(run_args)

def tag_image(self, image_name, image_tag):
"""
Expand All @@ -82,7 +90,7 @@ def tag_image(self, image_name, image_tag):
image_name,
full_tag,
]
run(run_args)
return run(run_args)

def push_image(self, image_tag):
"""
Expand All @@ -91,8 +99,5 @@ def push_image(self, image_tag):
sep = "" if self.registry.endswith("/") else "/"
full_tag = f"{self.registry}{sep}{image_tag}"
run_args = [self.engine, "push", full_tag]

if self.engine == "podman":
run_args.append(f"--tls-verify={self.tls_verify}")

run(run_args)
self.add_tls_verify_arg(run_args)
return run(run_args)