Merge branch 'chef-docker' into 'master'

Added note about chef Added note about chef being required to generate GitLab config. because of tweet https://twitter.com/grahamgilbert/status/621015318442459136 See merge request !982

Merge branch 'chef-docker' into 'master'
a98ca3e8 · Job van der Voort · 458053bc · 4944df86 · a98ca3e8
Commit a98ca3e8 authored Jul 16, 2015 by Job van der Voort
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

README.md docker/README.md +2 -0

No files found.
--- a/docker/README.md
+++ b/docker/README.md
@@ -165,3 +165,5 @@ sudo docker push gitlab/gitlab-ce:latest
 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.
+
+Our docker image runs chef at every start to generate GitLab configuration.