Merge pull request #1165 from thuvh/compose_include_defaults

chore: include default services into extras

doc/DEPLOYMENT.md

@@ -98,6 +98,7 @@ docker ps -a
 We have provided optional services in the file `docker-compose-extra.yml`.
 You do not need them for a fully functional installation of AppFlowy Cloud, but they could be helpful for various
 admin/debug tasks.
+We include all services in the file `docker-compose.yml`. It is easier to start all services and remove orphan containers warning message.
 
 - `pgadmin` (Web UI to visualize the provided postgres database)
 - `portainer`/`portainer_init` (Web UI to provide some monitoring and ease of container management)
@@ -107,8 +108,6 @@ admin/debug tasks.
 docker compose --file docker-compose-extras.yml up -d
 ```
 
-You may ignore the orphan containers warning message that docker will output.
-
 
 > When using the `docker compose up -d` command without specifying a tag, Docker Compose will pull the `latest`
 > tag for the `appflowy_cloud` and `admin_frontend` images from Docker Hub by default. If you've set

docker-compose-extras.yml

@@ -1,4 +1,6 @@
 # Non-essential additional services
+include:
+  - docker-compose.yml
 
 services:
   tunnel:
@@ -33,7 +35,3 @@ services:
       - PGADMIN_DEFAULT_PASSWORD=${PGADMIN_DEFAULT_PASSWORD}
     volumes:
       - ./docker/pgadmin/servers.json:/pgadmin4/servers.json
-
-volumes:
-  postgres_data:
-  minio_data: