diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2017-04-10 20:59:18 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2017-04-10 20:59:18 +0000 |
| commit | 7ae3001dac50ec8bf5949bda54575bcea9a89d3a (patch) | |
| tree | 7b45918d5d1631fd27b1d24cddb797fda69b9c73 | |
| parent | 9c2b0f5477366d1e6cfc2c42a037b5e894e0aba7 (diff) | |
| parent | 04e9dddf90cb50dae725606f4de184b99b395a79 (diff) | |
| download | gitlab-ce-7ae3001dac50ec8bf5949bda54575bcea9a89d3a.tar.gz | |
Merge branch 'dewet-do-disclaimer' into 'master'
Disclaimer for testing guide not be be used in prod
See merge request !10468
| -rw-r--r-- | doc/install/README.md | 4 | ||||
| -rw-r--r-- | doc/install/digitaloceandocker.md | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/doc/install/README.md b/doc/install/README.md index d35709266e4..58cc7d312fd 100644 --- a/doc/install/README.md +++ b/doc/install/README.md @@ -20,8 +20,8 @@ the hardware requirements. - [Docker](https://docs.gitlab.com/omnibus/docker/) - Install GitLab using Docker. - [Installation on Google Cloud Platform](google_cloud_platform/index.md) - Install GitLab on Google Cloud Platform using our official image. -- [Digital Ocean and Docker](digitaloceandocker.md) - Install GitLab quickly - on DigitalOcean using Docker. +- Testing only! [DigitalOcean and Docker Machine](digitaloceandocker.md) - + Quickly test any version of GitLab on DigitalOcean using Docker Machine. ## Database diff --git a/doc/install/digitaloceandocker.md b/doc/install/digitaloceandocker.md index 820060a489b..8efc0530b8a 100644 --- a/doc/install/digitaloceandocker.md +++ b/doc/install/digitaloceandocker.md @@ -1,4 +1,7 @@ -# Digital Ocean and Docker +# Digital Ocean and Docker Machine test environment + +## Warning. This guide is for quickly testing different versions of GitLab and +## not recommended for ease of future upgrades or keeping the data you create. ## Initial setup |