From 8ee84220a011670e79e5c07b5f768cbb71b9c540 Mon Sep 17 00:00:00 2001 From: Hoai-Thu Vuong Date: Wed, 15 Jan 2025 10:50:53 +0700 Subject: [PATCH] chore: include default services into extras --- doc/DEPLOYMENT.md | 3 +-- docker-compose-extras.yml | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/doc/DEPLOYMENT.md b/doc/DEPLOYMENT.md index 4db1e9a13..e2800cde0 100644 --- a/doc/DEPLOYMENT.md +++ b/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 diff --git a/docker-compose-extras.yml b/docker-compose-extras.yml index 275a4a5d7..8d8c2b84c 100644 --- a/docker-compose-extras.yml +++ b/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: