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.

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

Update references to compose.yaml #59

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion docs/remote_deploy_compose.md
Original file line number Diff line number Diff line change
Expand Up @@ -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: "docker.compose.${{ github.ref_name }}.yml"
secrets: inherit
```
6 changes: 3 additions & 3 deletions docs/test_compose.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -155,7 +155,7 @@ services:
| <a name="input_cache_extra_imgs"></a>[cache_extra_imgs](#input_cache_extra_imgs) | string | false | | Space separated list of images <br>to cache on each run <br>(e.g. to avoid rate limiting). |
| <a name="input_cache_image"></a>[cache_image](#input_cache_image) | boolean | false | `true` | Cache the built image, for <br>the next run. Default true. |
| <a name="input_compose_command"></a>[compose_command](#input_compose_command) | string | false | | The command to run for <br>the container. Default to built-in <br>image command. |
| <a name="input_compose_file"></a>[compose_file](#input_compose_file) | string | false | `"docker-compose.yml"` | The docker compose file used <br>to run the test. |
| <a name="input_compose_file"></a>[compose_file](#input_compose_file) | string | false | `"compose.yaml"` | The docker compose file used <br>to run the test. |
| <a name="input_compose_service"></a>[compose_service](#input_compose_service) | string | true | | The docker compose service to <br>run the test against. |
| <a name="input_coverage"></a>[coverage](#input_coverage) | boolean | false | `false` | Generate a coverage HTML report <br>(requires coverage.py installed). |
| <a name="input_environment"></a>[environment](#input_environment) | string | false | `"test"` | The environment to use for <br>testing. |
Expand Down