diff --git a/composer.md b/composer.md index 428cbce..7b90a63 100644 --- a/composer.md +++ b/composer.md @@ -1,23 +1 @@ # Note regarding composer.json - -## Meilisearch - - meilisearch/meilisearch-php - -Is locked to `v0.26.0` to prevent this error: - - Executing script cache:clear [KO] - [KO] - Script cache:clear returned with error code 1 - !! - !! In DebugClassLoader.php line 327: - !! - !! Case mismatch between loaded and declared class names: "MeiliSearch\Client" - !! vs "Meilisearch\Client". - !! - !! - !! - Script @auto-scripts was called via post-update-cmd - - -I have opened a ticket https://github.com/meilisearch/meilisearch-php/issues/452. diff --git a/docker-compose.override.yml b/docker-compose.override.yml index e7df768..3984cf6 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -1,5 +1,3 @@ -version: "3.4" - # Development environment override services: # https://localhost/_profiler/phpinfo @@ -30,8 +28,13 @@ services: maildev: image: maildev/maildev ports: - - 1080:1080 - - 1025:1025 + - "1080:1080" + - "1025:1025" + healthcheck: + test: ["CMD-SHELL", "wget -O - http://0.0.0.0:1080/healthz || exit 1"] + interval: 5s + timeout: 5s + retries: 5 storage: image: minio/minio diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 8c33061..ececd2b 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -1,5 +1,3 @@ -version: "3.4" - # Production environment override services: php: diff --git a/docker-compose.yml b/docker-compose.yml index 55b97de..416524a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,3 @@ -version: "3.4" - services: php: build: @@ -89,7 +87,7 @@ services: redis: image: redis:7-alpine ports: - - '6389:6379' + - "6389:6379" healthcheck: test: ["CMD-SHELL", "redis-cli -h 127.0.0.1 ping | grep 'PONG' || exit 1"] interval: 10s diff --git a/docs/README.md b/docs/README.md index 63f0942..c2e1dd1 100644 --- a/docs/README.md +++ b/docs/README.md @@ -21,16 +21,21 @@ Access `https://localhost` in your browser and accept the security risk. You should have access now to: -* Main project : https://localhost -* Meilisearch : http://localhost:7700/ +* The main frontend: https://localhost +* The Meilisearch UI: http://localhost:7700/ -To access the dev tools, run= +Note that you can also use the [online meilisearch-ui](https://meilisearch-ui.riccox.com). +Be careful it is not an official Meilisearch website, use only for dev data, do not +send cloud credentials. + +To access the dev tools, run: make start-dev You should have access now to: * Adminer : http://localhost:8989/?pgsql=database&username=app&db=app&ns=public&select=group +* Mailcatcher : http://localhost:1081/ * Maildev : http://localhost:1080 ## Makefile