admin/frappe_docker
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

Change .yml to .yaml in compose file to follow compose-spec

Browse Source
This commit is contained in:
Lev Vereshchagin
2021-12-15 08:41:25 +03:00
parent 5d3e7883f1
commit 2f58e621a5
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/main.py
View File

@@ -88,10 +88,10 @@ def docker_compose(*cmd: str):
"--env-file",
"tests/.env",
"-f",
"compose.yml",
"compose.yaml",
]
if CI:
args.extend(("-f", "tests/compose.ci.yml"))
args.extend(("-f", "tests/compose.ci.yaml"))
return run(*args, *cmd)
@@ -319,7 +319,7 @@ def stop_s3_container():
@log("Recreate with https override")
def recreate_with_https_override():
docker_compose("-f", "overrides/compose.https.yml", "up", "-d", "--quiet-pull")
docker_compose("-f", "overrides/compose.https.yaml", "up", "-d", "--quiet-pull")
@log("Check / (https)")
@@ -334,9 +334,9 @@ def stop_containers():
@log("Recreate with ERPNext override")
def create_containers_with_erpnext_override():
args = ["-f", "overrides/compose.erpnext.yml"]
args = ["-f", "overrides/compose.erpnext.yaml"]
if CI:
args.extend(("-f", "tests/compose.ci-erpnext.yml"))
args.extend(("-f", "tests/compose.ci-erpnext.yaml"))
docker_compose(*args, "up", "-d", "--quiet-pull")
@@ -376,9 +376,9 @@ def check_erpnext_assets():
@log("Create containers with Postgres override")
def create_containers_with_postgres_override():
args = ["-f", "overrides/compose.postgres.yml"]
args = ["-f", "overrides/compose.postgres.yaml"]
if CI:
args.extend(("-f", "tests/compose.ci.postgres.yml"))
args.extend(("-f", "tests/compose.ci.postgres.yaml"))
docker_compose(*args, "up", "-d", "--quiet-pull")