Skip to content
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

Jump to bottom

Add disable-extra-hosts flag #692

Open
wants to merge 1 commit into
base: 0.1.x
Choose a base branch
from
Open

Add disable-extra-hosts flag #692

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 8 additions & 5 deletions podman_compose.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -674,7 +674,7 @@ def norm_ports(ports_in):
ports_out.append(port)
return ports_out

def container_to_args(compose, cnt, detached=True):
def container_to_args(compose, cnt, detached=True, extra_hosts=True):
# TODO: double check -e , --add-host, -v, --read-only
dirname = compose.dirname
pod = cnt.get('pod', None) or ''
Expand Down Expand Up @@ -727,8 +727,9 @@ def container_to_args(compose, cnt, detached=True):
podman_args += [f'--log-opt={name}={value}' for name, value in log_opts.items()]
for secret in cnt.get('secrets', []):
podman_args.extend(get_secret_args(compose, cnt, secret))
for i in cnt.get('extra_hosts', []):
podman_args.extend(['--add-host', i])
if extra_hosts:
for i in cnt.get('extra_hosts', []):
podman_args.extend(['--add-host', i])
for i in cnt.get('expose', []):
podman_args.extend(['--expose', i])
if cnt.get('publishall', None):
Expand Down Expand Up @@ -1482,7 +1483,7 @@ def compose_up(compose, args):
if cnt["_service"] in excluded:
print("** skipping: ", cnt['name'])
continue
podman_args = container_to_args(compose, cnt, detached=args.detach)
podman_args = container_to_args(compose, cnt, detached=args.detach, extra_hosts=args.extra_hosts)
subproc = compose.podman.run([], podman_command, podman_args)
if podman_command == 'run' and subproc and subproc.returncode:
compose.podman.run([], 'start', [cnt['name']])
Expand Down Expand Up @@ -1590,7 +1591,7 @@ def compose_run(compose, args):
if args.rm and 'restart' in cnt:
del cnt['restart']
# run podman
podman_args = container_to_args(compose, cnt, args.detach)
podman_args = container_to_args(compose, cnt, args.detach, args.extra_hosts)
if not args.detach:
podman_args.insert(1, '-i')
if args.rm:
Expand Down Expand Up @@ -1702,6 +1703,8 @@ def compose_up_parse(parser):
help="Scale SERVICE to NUM instances. Overrides the `scale` setting in the Compose file if present.")
parser.add_argument("--exit-code-from", metavar='SERVICE', type=str, default=None,
help="Return the exit code of the selected service container. Implies --abort-on-container-exit.")
parser.add_argument("--disable-extra-hosts", dest="extra_hosts", action='store_false', default=True,
help="Don't pass --add-host when starting containers. Fixes: https://github.com/containers/podman/issues/15373")

@cmd_parse(podman_compose, 'down')
def compose_down_parse(parser):
Expand Down