Skip to content

Commit

Permalink
chore: upgrade to Docker Compose v2 (#4836)
Browse files Browse the repository at this point in the history
  • Loading branch information
Jolg42 committed Apr 30, 2024
1 parent c559fb9 commit d3ec637
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test-quaint.yml
Expand Up @@ -38,7 +38,7 @@ jobs:
key: ${{ runner.os }}-cargo-${{ matrix.features }}

- name: Start Databases
run: docker-compose -f docker-compose.yml up -d
run: docker compose -f docker-compose.yml up -d
working-directory: ./quaint

- name: Sleep for 20s
Expand Down
2 changes: 1 addition & 1 deletion libs/test-setup/src/test_api_args.rs
Expand Up @@ -18,7 +18,7 @@ pub(crate) struct DbUnderTest {
const MISSING_TEST_DATABASE_URL_MSG: &str = r#"
Missing TEST_DATABASE_URL from environment.
If you are developing with the docker-compose based setup, you can find the environment variables under .test_database_urls at the project root.
If you are developing with the docker compose based setup, you can find the environment variables under .test_database_urls at the project root.
Example usage:
Expand Down
2 changes: 1 addition & 1 deletion quaint/.github/workflows/test.yml
Expand Up @@ -80,7 +80,7 @@ jobs:
key: ${{ runner.os }}-cargo-${{ matrix.features }}

- name: Start Databases
run: docker-compose -f docker-compose.yml up -d
run: docker compose -f docker-compose.yml up -d

- name: Sleep for 20s
uses: juliangruber/sleep-action@v2
Expand Down
2 changes: 1 addition & 1 deletion query-engine/connector-test-kit-rs/README.md
Expand Up @@ -354,7 +354,7 @@ Let's say you already have connector tests for MongoDB but right now it runs onl
2. Create a connector file in the `query-engine/connector-test-kit-rs/test-configs/` with the connector data (see other examples in that director), name it with something that makes sense, for example `mongo5`
3. Add the credentials to access the _data store service_ from the docker compose file, this is done creating the required file in `.test_database_urls`, for example `.test_database_urls/mongo5`
4. Make sure this image is available to build and prepare the environment in the `Makefile`, in the query engine we depend in two Make targets, `dev-` and `start-`
- The `start-` target (for example `start-mongo5`) will execute the _data store service_ in docker compose, for example `docker-compose -f docker-compose.yml up -d --remove-orphans mongo5`
- The `start-` target (for example `start-mongo5`) will execute the _data store service_ in docker compose, for example `docker compose -f docker-compose.yml up -d --remove-orphans mongo5`
- The `dev-` target (for example `dev-mongo5`) will depend on the `start-` target and copy the correct _connector file_, for example `cp $(CONFIG_PATH)/mongodb5 $(CONFIG_FILE)`
5. Add the new test data store source to the `query-engine/connector-test-kit-rs/query-test-setup/src/connector_tag` file, if it is a completely new data store create the required file, in our case we need to modify `mongodb.rs`
- Add the new version to the version enum (ex. `MongoDbVersion`)
Expand Down
2 changes: 1 addition & 1 deletion schema-engine/sql-introspection-tests/tests/simple.rs
Expand Up @@ -73,7 +73,7 @@ fn run_simple_test(test_file_path: &str, test_function_name: &'static str) {
let mut database_url = std::env::var("TEST_DATABASE_URL").expect(r#"
Missing TEST_DATABASE_URL from environment.
If you are developing with the docker-compose based setup, you can find the environment variables under .test_database_urls at the project root.
If you are developing with the docker compose based setup, you can find the environment variables under .test_database_urls at the project root.
Example usage:
Expand Down

0 comments on commit d3ec637

Please sign in to comment.