summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorVincent Robert <vincent.robert@cantor.fr>2014-12-04 10:38:04 +0100
committerVincent Robert <vincent.robert@cantor.fr>2014-12-04 10:38:04 +0100
commit58b58fe44b0924ce24f2f3e5d63b0f99fcf22f9f (patch)
treed93a421ed093598bf0f5af9a2dd345fa3f62727b /docker
parentd7aff11876f517d9e9cb4eb2237ceed4211d7013 (diff)
downloadgitlab-ce-58b58fe44b0924ce24f2f3e5d63b0f99fcf22f9f.tar.gz
gitlab-ctl can now be followed with docker logs
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile2
-rw-r--r--docker/README.md2
2 files changed, 2 insertions, 2 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 93c564fc03b..e9b7883e983 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -29,4 +29,4 @@ VOLUME ["/var/opt/gitlab", "/var/log/gitlab", "/etc/gitlab"]
ADD gitlab.rb /etc/gitlab/
# Default is to run runit & reconfigure
-CMD gitlab-ctl reconfigure > /var/log/gitlab/reconfigure.log & /opt/gitlab/embedded/bin/runsvdir-start
+CMD gitlab-ctl reconfigure & /opt/gitlab/embedded/bin/runsvdir-start
diff --git a/docker/README.md b/docker/README.md
index a489203d017..e66278632f7 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -39,7 +39,7 @@ After creating this run GitLab:
sudo docker run --detach --name gitlab_app --publish 8080:80 --publish 2222:22 --volumes-from gitlab_data gitlab_image
```
-It might take a while before the docker container is responding to queries.
+It might take a while before the docker container is responding to queries. You can follow the configuration process with `docker logs -f gitlab`.
You can then go to `http://localhost:8080/` (or `http://192.168.59.103:8080/` if you use boot2docker).
You can login with username `root` and password `5iveL!fe`.