accounting/frappe_docker
2
0
Fork 0
mirror of https://github.com/frappe/frappe_docker.git synced 2024-11-09 23:00:56 +00:00
Code Issues Releases 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/main.yml vendored
View File

@ -12,7 +12,7 @@ on:
# - build/worker/** # - build/worker/**
# - overrides/** # - overrides/**
# - tests/** # - tests/**
# - compose.yml # - compose.yaml
# - docker-bake.hcl # - docker-bake.hcl
# - example.env # - example.env
@ -25,7 +25,7 @@ on:
# - build/worker/** # - build/worker/**
# - overrides/** # - overrides/**
# - tests/** # - tests/**
# - compose.yml # - compose.yaml
# - docker-bake.hcl # - docker-bake.hcl
# - example.env # - example.env

0
compose.yml → compose.yaml
View File

0
tests/compose.ci-erpnext.yml → tests/compose.ci-erpnext.yaml
View File

0
tests/compose.ci-postgres.yml → tests/compose.ci-postgres.yaml
View File

0
tests/compose.ci.yml → tests/compose.ci.yaml
View File

14
tests/main.py
View File

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