From fd084cbddb8b0e5cc2b1bbd6b75dbe510527eac9 Mon Sep 17 00:00:00 2001 From: casdal <141283367+casdal@users.noreply.github.com> Date: Wed, 18 Dec 2024 10:01:30 -0500 Subject: [PATCH 1/3] Update references to compose.yaml Signed-off-by: casdal <141283367+casdal@users.noreply.github.com> --- docs/remote_deploy_compose.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/remote_deploy_compose.md b/docs/remote_deploy_compose.md index 8bca312..5ca67da 100644 --- a/docs/remote_deploy_compose.md +++ b/docs/remote_deploy_compose.md @@ -74,6 +74,6 @@ deploy-containers: uses: hotosm/gh-workflows/.github/workflows/remote_deploy_compose.yml@main with: environment: ${{ github.ref_name }} - docker_compose_file: "docker-compose.${{ github.ref_name }}.yml" + docker_compose_file: "compose.${{ github.ref_name }}.yaml" secrets: inherit ``` From 8bc1f4391b24fb96b80887683c507fcf853ca92d Mon Sep 17 00:00:00 2001 From: casdal <141283367+casdal@users.noreply.github.com> Date: Wed, 18 Dec 2024 12:51:52 -0500 Subject: [PATCH 2/3] Revert changes. Signed-off-by: casdal <141283367+casdal@users.noreply.github.com> --- docs/remote_deploy_compose.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/remote_deploy_compose.md b/docs/remote_deploy_compose.md index 5ca67da..3bedd3a 100644 --- a/docs/remote_deploy_compose.md +++ b/docs/remote_deploy_compose.md @@ -74,6 +74,6 @@ deploy-containers: uses: hotosm/gh-workflows/.github/workflows/remote_deploy_compose.yml@main with: environment: ${{ github.ref_name }} - docker_compose_file: "compose.${{ github.ref_name }}.yaml" + docker_compose_file: "docker.compose.${{ github.ref_name }}.yml" secrets: inherit ``` From 4d95f8ceec577310d8d717311c16eb0169850f5e Mon Sep 17 00:00:00 2001 From: casdal <141283367+casdal@users.noreply.github.com> Date: Wed, 18 Dec 2024 12:57:36 -0500 Subject: [PATCH 3/3] Update references to compose.yaml Signed-off-by: casdal <141283367+casdal@users.noreply.github.com> --- docs/test_compose.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/test_compose.md b/docs/test_compose.md index 988d581..cb20f02 100644 --- a/docs/test_compose.md +++ b/docs/test_compose.md @@ -14,11 +14,11 @@ underlying database, or any additional services. - The tests inside the container, by two possible options: - Copied into your container build under **WORKDIR**. - - Mounted within the docker-compose.yml file under **WORKDIR**. + - Mounted within the compose.yaml file under **WORKDIR**. - The testing tool must be installed for the dockerfile **USER**. -- The service in the docker-compose.yml must have a **TAG_OVERRIDE**. +- The service in the compose.yaml must have a **TAG_OVERRIDE**. ```yaml services: @@ -155,7 +155,7 @@ services: | [cache_extra_imgs](#input_cache_extra_imgs) | string | false | | Space separated list of images
to cache on each run
(e.g. to avoid rate limiting). | | [cache_image](#input_cache_image) | boolean | false | `true` | Cache the built image, for
the next run. Default true. | | [compose_command](#input_compose_command) | string | false | | The command to run for
the container. Default to built-in
image command. | -| [compose_file](#input_compose_file) | string | false | `"docker-compose.yml"` | The docker compose file used
to run the test. | +| [compose_file](#input_compose_file) | string | false | `"compose.yaml"` | The docker compose file used
to run the test. | | [compose_service](#input_compose_service) | string | true | | The docker compose service to
run the test against. | | [coverage](#input_coverage) | boolean | false | `false` | Generate a coverage HTML report
(requires coverage.py installed). | | [environment](#input_environment) | string | false | `"test"` | The environment to use for
testing. |