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

several fix as note in the commit message #689

Closed
wants to merge 7 commits into from
Closed

several fix as note in the commit message #689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
705cd2c
pod switch revert to `--no-pod`, pod enabled by default
rtgiskard May 3, 2023
8c1aa5e
support `network` for build
rtgiskard May 3, 2023
0f14310
fix exception for `--dry-run`
rtgiskard May 3, 2023
7015b8b
trim whitespaces for bash completion config
rtgiskard May 3, 2023
9d5434c
fix support for `network_mode: none`
rtgiskard May 3, 2023
b8e35e7
respect container name
rtgiskard May 4, 2023
499fcec
add `--no-label` switch to disable default labels
rtgiskard May 3, 2023
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
8 changes: 4 additions & 4 deletions completion/bash/podman-compose
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ _podmanCompose() {
help_opts="-h --help"

# global options that don't take additional arguments
basic_global_opts="${help_opts} -v --no-ansi --no-cleanup --dry-run"
basic_global_opts="${help_opts} -v --no-ansi --no-cleanup --dry-run"

# global options that take paths as arguments
path_arg_global_opts="-f --file --podman-path"
Expand All @@ -291,7 +291,7 @@ _podmanCompose() {
if [[ $? -eq 0 ]]; then
return 0
fi

# computing comp_cword_adj, which thruthfully tells us how deep in the subcommands tree we are
# additionally, set the chosen_root_command if possible
comp_cword_adj=${COMP_CWORD}
Expand All @@ -309,7 +309,7 @@ _podmanCompose() {
fi
if [[ ${el} == -* && ${el} != ${cur} ]]; then
let "comp_cword_adj--"

for opt in ${arg_global_opts_array[@]}; do
if [[ ${el} == ${opt} ]]; then
skip_next="yes"
Expand All @@ -320,7 +320,7 @@ _podmanCompose() {
fi
done
fi

if [[ ${comp_cword_adj} -eq 1 ]]; then
_completeRoot

Expand Down
112 changes: 53 additions & 59 deletions podman_compose.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ def norm_ulimit(inner_value):


def transform(args, project_name, given_containers):
if not args.in_pod:
if args.no_pod:
pod_name = None
pods = []
else:
Expand Down Expand Up @@ -403,13 +403,9 @@ def assert_volume(compose, mount_dict):
if is_ext:
raise RuntimeError(f"External volume [{vol_name}] does not exists") from e
labels = vol.get("labels", None) or []
args = [
"create",
"--label",
f"io.podman.compose.project={proj_name}",
"--label",
f"com.docker.compose.project={proj_name}",
]
args = ["create"]
if not compose.global_args.no_label:
args.extend(["--label", f"io.podman.compose.project={proj_name}"])
for item in norm_as_list(labels):
args.extend(["--label", item])
driver = vol.get("driver", None)
Expand Down Expand Up @@ -739,13 +735,9 @@ def assert_cnt_nets(compose, cnt):
raise RuntimeError(
f"External network [{net_name}] does not exists"
) from e
args = [
"create",
"--label",
f"io.podman.compose.project={proj_name}",
"--label",
f"com.docker.compose.project={proj_name}",
]
args = ["create"]
if not compose.global_args.no_label:
args.extend(["--label", f"io.podman.compose.project={proj_name}"])
# TODO: add more options here, like dns, ipv6, etc.
labels = net_desc.get("labels", None) or []
for item in norm_as_list(labels):
Expand Down Expand Up @@ -788,29 +780,24 @@ def get_net_args(compose, cnt):
net_args.extend(["--mac-address", mac_address])
is_bridge = False
net = cnt.get("network_mode", None)
if net:
if net == "none":
is_bridge = False
elif net == "host":
net_args.extend(["--network", net])
elif net.startswith("slirp4netns:"):
net_args.extend(["--network", net])
elif net.startswith("ns:"):
net_args.extend(["--network", net])
elif net.startswith("service:"):
other_srv = net.split(":", 1)[1].strip()
other_cnt = compose.container_names_by_service[other_srv][0]
net_args.extend(["--network", f"container:{other_cnt}"])
elif net.startswith("container:"):
other_cnt = net.split(":", 1)[1].strip()
net_args.extend(["--network", f"container:{other_cnt}"])
elif net.startswith("bridge"):
is_bridge = True
else:
print(f"unknown network_mode [{net}]")
sys.exit(1)
else:
if net is None or net.startswith("bridge"):
is_bridge = True
elif net in ("host", "none"):
net_args.extend(["--network", net])
elif net.startswith("slirp4netns:"):
net_args.extend(["--network", net])
elif net.startswith("ns:"):
net_args.extend(["--network", net])
elif net.startswith("service:"):
other_srv = net.split(":", 1)[1].strip()
other_cnt = compose.container_names_by_service[other_srv][0]
net_args.extend(["--network", f"container:{other_cnt}"])
elif net.startswith("container:"):
other_cnt = net.split(":", 1)[1].strip()
net_args.extend(["--network", f"container:{other_cnt}"])
else:
print(f"unknown network_mode [{net}]")
sys.exit(1)
proj_name = compose.project_name
default_net = compose.default_net
nets = compose.networks
Expand Down Expand Up @@ -1649,15 +1636,15 @@ def _parse_compose_file(self):
raise RuntimeError(f"missing networks: {missing_nets_str}")
# volumes: [...]
self.vols = compose.get("volumes", {})
podman_compose_labels = [
"io.podman.compose.config-hash=" + self.yaml_hash,
"io.podman.compose.project=" + project_name,
"io.podman.compose.version=" + __version__,
f"PODMAN_SYSTEMD_UNIT=podman-compose@{project_name}.service",
"com.docker.compose.project=" + project_name,
"com.docker.compose.project.working_dir=" + dirname,
"com.docker.compose.project.config_files=" + ",".join(relative_files),
]
if self.global_args.no_label:
podman_compose_labels = []
else:
podman_compose_labels = [
"io.podman.compose.version=" + __version__,
"io.podman.compose.config-hash=" + self.yaml_hash,
"io.podman.compose.project=" + project_name,
"io.podman.compose.project.config_files=" + ",".join(relative_files),
]
# other top-levels:
# networks: {driver: ...}
# configs: {...}
Expand Down Expand Up @@ -1687,12 +1674,13 @@ def _parse_compose_file(self):
labels = norm_as_list(cnt.get("labels", None))
cnt["ports"] = norm_ports(cnt.get("ports", None))
labels.extend(podman_compose_labels)
labels.extend(
[
f"com.docker.compose.container-number={num}",
"com.docker.compose.service=" + service_name,
]
)
if not self.global_args.no_label:
labels.extend(
[
f"io.podman.compose.container-number={num}",
f"io.podman.compose.service={service_name}",
]
)
cnt["labels"] = labels
cnt["_service"] = service_name
cnt["_project"] = project_name
Expand Down Expand Up @@ -1768,11 +1756,9 @@ def _parse_args(self):
def _init_global_parser(parser):
parser.add_argument("-v", "--version", help="show version", action="store_true")
parser.add_argument(
"--in-pod",
help="pod creation",
metavar="in_pod",
type=bool,
default=True,
"--no-pod",
help="disable pod creation",
action="store_true",
)
parser.add_argument(
"--pod-args",
Expand Down Expand Up @@ -1841,6 +1827,11 @@ def _init_global_parser(parser):
help="Do not stop and remove existing pod & containers",
action="store_true",
)
parser.add_argument(
"--no-label",
help="disable default labels",
action="store_true",
)
parser.add_argument(
"--dry-run",
help="No action; perform a simulation of commands",
Expand Down Expand Up @@ -2074,6 +2065,8 @@ def build_one(compose, args, cnt):
build_args.extend(["-t", tag])
if "target" in build_desc:
build_args.extend(["--target", build_desc["target"]])
if "network" in build_desc:
build_args.extend(["--network", build_desc["network"]])
container_to_ulimit_args(cnt, build_args)
if getattr(args, "no_cache", None):
build_args.append("--no-cache")
Expand Down Expand Up @@ -2395,7 +2388,7 @@ def compose_run(compose, args):
name0 = "{}_{}_tmp{}".format(
compose.project_name, args.service, random.randrange(0, 65536)
)
cnt["name"] = args.name or name0
cnt["name"] = args.name or container_name or name0
if args.entrypoint:
cnt["entrypoint"] = args.entrypoint
if args.user:
Expand Down Expand Up @@ -2431,7 +2424,8 @@ def compose_run(compose, args):
if args.rm:
podman_args.insert(1, "--rm")
p = compose.podman.run([], "run", podman_args, sleep=0)
sys.exit(p.returncode)
if p:
sys.exit(p.returncode)


@cmd_run(podman_compose, "exec", "execute a command in a running container")
Expand Down