summaryrefslogtreecommitdiff
path: root/docker/README.md
diff options
context:
space:
mode:
authorJob van der Voort <job@gitlab.com>2015-07-16 20:19:51 +0000
committerJob van der Voort <job@gitlab.com>2015-07-16 20:19:51 +0000
commita98ca3e815d06100c1df9404f1a17a34cd17c7f2 (patch)
tree5e03921098928a28079363a8ba32fe3ead7d092b /docker/README.md
parent458053bcb4e27fa70923bb61292eb75255f1680e (diff)
parent4944df86fad5adc69451be519cf3a26407c718eb (diff)
downloadgitlab-ce-a98ca3e815d06100c1df9404f1a17a34cd17c7f2.tar.gz
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
Diffstat (limited to 'docker/README.md')
-rw-r--r--docker/README.md2
1 files changed, 2 insertions, 0 deletions
diff --git a/docker/README.md b/docker/README.md
index 23093d35759..e4d56cdb336 100644
--- 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.