Skip to content

Commit

Permalink
v2.1, v3.0/how-to/get-started: remove docker-compose document (#1401)
Browse files Browse the repository at this point in the history
  • Loading branch information
TomShawn authored Jul 31, 2019
1 parent 0aa26bf commit 9f4bdf7
Show file tree
Hide file tree
Showing 13 changed files with 4 additions and 372 deletions.
1 change: 0 additions & 1 deletion _index.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ TiDB can be deployed on-premise or in-cloud. The following deployment options ar
- [Ansible Deployment](/v3.0/how-to/deploy/orchestrated/ansible.md): This guide describes how to deploy TiDB using Ansible. It is strongly recommended for production deployment.
- [Ansible Offline Deployment](/v3.0/how-to/deploy/orchestrated/offline-ansible.md): If your environment has no access to the internet, you can follow this guide to see how to deploy a TiDB cluster offline using Ansible.
- [Docker Deployment](/v3.0/how-to/deploy/orchestrated/docker.md): This guide describes how to deploy TiDB using Docker.
- [Docker Compose Deployment](/v3.0/how-to/get-started/deploy-tidb-from-docker-compose.md): This guide describes how to deploy TiDB using Docker compose. You can follow this guide to quickly deploy a TiDB cluster for testing and development on your local drive.
- Kubernetes Deployment:

You can use [TiDB Operator](https://github.com/pingcap/tidb-operator) to deploy TiDB on:
Expand Down
1 change: 0 additions & 1 deletion v2.1/TOC.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
+ Start a Local Cluster
- [From Binary](how-to/get-started/local-cluster/install-from-binary.md)
- [In Kubernetes](how-to/get-started/local-cluster/install-from-kubernetes.md)
- [In Docker Compose](how-to/get-started/local-cluster/install-from-docker-compose.md)
- [Explore SQL with TiDB](how-to/get-started/explore-sql.md)
- [Import Example Database](how-to/get-started/import-example-database.md)
- [Read Historical Data](how-to/get-started/read-historical-data.md)
Expand Down
1 change: 0 additions & 1 deletion v2.1/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ TiDB can be deployed on-premise or in-cloud. The following deployment options ar
- [Ansible Deployment](/how-to/deploy/orchestrated/ansible.md): This guide describes how to deploy TiDB using Ansible. It is strongly recommended for production deployment.
- [Ansible Offline Deployment](/how-to/deploy/orchestrated/offline-ansible.md): If your environment has no access to the internet, you can follow this guide to see how to deploy a TiDB cluster offline using Ansible.
- [Docker Deployment](/how-to/deploy/orchestrated/docker.md): This guide describes how to deploy TiDB using Docker.
- [Docker Compose Deployment](/how-to/get-started/local-cluster/install-from-docker-compose.md): This guide describes how to deploy TiDB using Docker compose. You can follow this guide to quickly deploy a TiDB cluster for testing and development on your local drive.
- [Kubernetes Deployment (beta)](/how-to/get-started/local-cluster/install-from-kubernetes.md): This guide describes how to deploy TiDB on Kubernetes using [TiDB Operator](https://github.com/pingcap/tidb-operator). You can follow this guide to see how to deploy TiDB on Google Kubernetes Engine or deploy TiDB locally using Docker in Docker.
- [Binary Tarball Deployment](/how-to/deploy/from-tarball/production-environment.md): This guide describes how to deploy TiDB from a binary tarball in production. Guides for [development](/how-to/get-started/local-cluster/install-from-binary.md) and [testing](/how-to/deploy/from-tarball/testing-environment.md) environments are also available.

Expand Down
2 changes: 1 addition & 1 deletion v2.1/faq/tidb.md
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ It is not recommended to deploy TiDB offline using Ansible. If the Control Machi

#### How to deploy TiDB quickly using Docker Compose on a single machine?

You can use Docker Compose to build a TiDB cluster locally, including the cluster monitoring components. You can also customize the version and number of instances for each component. The configuration file can also be customized. You can only use this deployment method for testing and development environment. For details, see [Building the Cluster Using Docker Compose](/how-to/get-started/local-cluster/install-from-docker-compose.md).
You can use Docker Compose to build a TiDB cluster locally, including the cluster monitoring components. You can also customize the version and number of instances for each component. The configuration file can also be customized. You can only use this deployment method for testing and development environment.

#### How to separately record the slow query log in TiDB? How to locate the slow query SQL statement?

Expand Down
2 changes: 1 addition & 1 deletion v2.1/how-to/deploy/orchestrated/ansible.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Before you start, make sure you have:

> **Note:**
>
> When you deploy TiDB using Ansible, **use SSD disks for the data directory of TiKV and PD nodes**. Otherwise, it cannot pass the check. If you only want to try TiDB out and explore the features, it is recommended to [deploy TiDB using Docker Compose](/how-to/get-started/local-cluster/install-from-docker-compose.md) on a single machine.
> When you deploy TiDB using Ansible, **use SSD disks for the data directory of TiKV and PD nodes**. Otherwise, it cannot pass the check.
2. A Control Machine that meets the following requirements:

Expand Down
178 changes: 0 additions & 178 deletions v2.1/how-to/get-started/local-cluster/install-from-docker-compose.md

This file was deleted.

1 change: 0 additions & 1 deletion v2.1/overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ TiDB can be deployed on-premise or in-cloud. The following deployment options ar
- [Ansible Deployment](/how-to/deploy/orchestrated/ansible.md): This guide describes how to deploy TiDB using Ansible. It is strongly recommended for production deployment.
- [Ansible Offline Deployment](/how-to/deploy/orchestrated/offline-ansible.md): If your environment has no access to the internet, you can follow this guide to see how to deploy a TiDB cluster offline using Ansible.
- [Docker Deployment](/how-to/deploy/orchestrated/docker.md): This guide describes how to deploy TiDB using Docker.
- [Docker Compose Deployment](/how-to/get-started/local-cluster/install-from-docker-compose.md): This guide describes how to deploy TiDB using Docker compose. You can follow this guide to quickly deploy a TiDB cluster for testing and development on your local drive. But DO NOT USE this in production!
- [Kubernetes Deployment (beta)](/how-to/get-started/local-cluster/install-from-kubernetes.md): This guide describes how to deploy TiDB on Kubernetes using [TiDB Operator](https://github.com/pingcap/tidb-operator). You can follow this guide to see how to deploy TiDB on Google Kubernetes Engine or deploy TiDB locally using Docker in Docker.
- [Binary Tarball Deployment](/how-to/deploy/from-tarball/production-environment.md): This guide describes how to deploy TiDB from a binary tarball in production. Guides for [development](/how-to/get-started/local-cluster/install-from-binary.md) and [testing](/how-to/deploy/from-tarball/testing-environment.md) environments are also available.

Expand Down
1 change: 0 additions & 1 deletion v3.0/TOC.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
- [From Binary](how-to/get-started/deploy-tidb-from-binary.md)
- [From Homebrew](how-to/get-started/deploy-tidb-from-homebrew.md)
- [From DBdeployer](how-to/get-started/deploy-tidb-from-dbdeployer.md)
- [In Docker Compose](how-to/get-started/deploy-tidb-from-docker-compose.md)
- [Explore SQL with TiDB](how-to/get-started/explore-sql.md)
- [Import Example Database](how-to/get-started/import-example-database.md)
- [Read Historical Data](how-to/get-started/read-historical-data.md)
Expand Down
1 change: 0 additions & 1 deletion v3.0/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ TiDB can be deployed on-premise or in-cloud. The following deployment options ar
- [Ansible Deployment](/how-to/deploy/orchestrated/ansible.md): This guide describes how to deploy TiDB using Ansible. It is strongly recommended for production deployment.
- [Ansible Offline Deployment](/how-to/deploy/orchestrated/offline-ansible.md): If your environment has no access to the internet, you can follow this guide to see how to deploy a TiDB cluster offline using Ansible.
- [Docker Deployment](/how-to/deploy/orchestrated/docker.md): This guide describes how to deploy TiDB using Docker.
- [Docker Compose Deployment](/how-to/get-started/deploy-tidb-from-docker-compose.md): This guide describes how to deploy TiDB using Docker compose. You can follow this guide to quickly deploy a TiDB cluster for testing and development on your local drive.
- Kubernetes Deployment:

You can use [TiDB Operator](https://github.com/pingcap/tidb-operator) to deploy TiDB on:
Expand Down
2 changes: 1 addition & 1 deletion v3.0/faq/tidb.md
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ It is not recommended to deploy TiDB offline using Ansible. If the Control Machi

#### How to deploy TiDB quickly using Docker Compose on a single machine?

You can use Docker Compose to build a TiDB cluster locally, including the cluster monitoring components. You can also customize the version and number of instances for each component. The configuration file can also be customized. You can only use this deployment method for testing and development environment. For details, see [Building the Cluster Using Docker Compose](/how-to/get-started/deploy-tidb-from-docker-compose.md).
You can use Docker Compose to build a TiDB cluster locally, including the cluster monitoring components. You can also customize the version and number of instances for each component. The configuration file can also be customized. You can only use this deployment method for testing and development environment.

#### How to separately record the slow query log in TiDB? How to locate the slow query SQL statement?

Expand Down
2 changes: 1 addition & 1 deletion v3.0/how-to/deploy/orchestrated/ansible.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ Before you start, make sure you have:

> **Note:**
>
> When you deploy TiDB using Ansible, **use SSD disks for the data directory of TiKV and PD nodes**. Otherwise, it cannot pass the check. If you only want to try TiDB out and explore the features, it is recommended to [deploy TiDB using Docker Compose](/how-to/get-started/deploy-tidb-from-docker-compose.md) on a single machine.
> When you deploy TiDB using Ansible, **use SSD disks for the data directory of TiKV and PD nodes**. Otherwise, it cannot pass the check.
2. A Control Machine that meets the following requirements:

Expand Down
Loading

0 comments on commit 9f4bdf7

Please sign in to comment.