summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSytse Sijbrandij <sytse@gitlab.com>2015-07-10 20:16:55 +0000
committerSytse Sijbrandij <sytse@gitlab.com>2015-07-10 20:16:55 +0000
commitb5e2dd6f320d3c15d898616fd8e9c41a52e9ddf4 (patch)
tree4b846477215253d125d0ce55188f0e8080370a2d
parent526813581b042bc6abad60eb4e582be81620be77 (diff)
parentf110bb2db22edf7d6bcf31ac7abe5c80982ccd32 (diff)
downloadgitlab-ce-b5e2dd6f320d3c15d898616fd8e9c41a52e9ddf4.tar.gz
Merge branch 'fig-info' into 'master'
information about why we use fig.yml Because of tweet https://twitter.com/nicholasruunu/status/619533541605539841 cc/ @sytses @ayufan See merge request !960
-rw-r--r--docker/README.md8
1 files changed, 5 insertions, 3 deletions
diff --git a/docker/README.md b/docker/README.md
index 8df603eca4f..293ca79f915 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -94,12 +94,12 @@ To upgrade GitLab to new version you have to do:
sudo docker stop gitlab
```
-1. stop running container,
+1. stop running container,
```bash
sudo docker rm gitlab
```
-1. remove existing container,
+1. remove existing container,
```bash
sudo docker pull gitlab/gitlab-ce:latest
```
@@ -162,4 +162,6 @@ sudo docker push gitlab/gitlab-ce:latest
## Troubleshooting
-Please see the [troubleshooting](troubleshooting.md) file in this directory. \ No newline at end of file
+Please see the [troubleshooting](troubleshooting.md) file in this directory.
+
+Note: We use `fig.yml` to have compatibility with fig and because docker-compose also supports it.