Commit a98ca3e8 authored by Job van der Voort's avatar Job van der Voort

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
parents 458053bc 4944df86
......@@ -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.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment