diff --git a/podman_compose.py b/podman_compose.py index 18d1ced..976d641 100755 --- a/podman_compose.py +++ b/podman_compose.py @@ -876,7 +876,7 @@ class PodmanCompose: ])) files = args.file if not files: - print("no compose.yaml, docker-compose.yml ot container-compose.yml file found, pass files with -f") + print("no compose.yaml, docker-compose.yml or container-compose.yml file found, pass files with -f") exit(-1) ex = map(os.path.exists, files) missing = [ fn0 for ex0, fn0 in zip(ex, files) if not ex0 ] @@ -900,7 +900,7 @@ class PodmanCompose: os.chdir(dirname) if not project_name: - # More strict then acually needed for simplicity: podman requires [a-zA-Z0-9][a-zA-Z0-9_.-]* + # More strict then actually needed for simplicity: podman requires [a-zA-Z0-9][a-zA-Z0-9_.-]* project_name = norm_re.sub('', dir_basename.lower()) if not project_name: raise RuntimeError("Project name [{}] normalized to empty".format(dir_basename)) diff --git a/tests/multicompose/README.md b/tests/multicompose/README.md index da032a1..7e2c515 100644 --- a/tests/multicompose/README.md +++ b/tests/multicompose/README.md @@ -12,8 +12,8 @@ curl http://${d1_web1_1}:8002/index.txt we need to verify -- project base directory and prject name is `d1` -- `var12='d1/12.env'` which means `enf_file` was appened not replaced (which means that we normalize to array before merge) +- project base directory and project name is `d1` +- `var12='d1/12.env'` which means `enf_file` was appended not replaced (which means that we normalize to array before merge) - `var2='d1/2.env'` which means that paths inside `d2/docker-compose.yml` directory are relative to `d1`