summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorSytse Sijbrandij <sytse@gitlab.com>2015-05-06 16:39:30 +0200
committerSytse Sijbrandij <sytse@gitlab.com>2015-05-06 16:39:30 +0200
commit6518c728acca65732f89a22a5cbbb75fe3f238f6 (patch)
treee3d006854968479e78c06ebdbd20de5e351b025d /docker
parente8edd20bfd4f27a3dc644a86b667e1d2900b729e (diff)
downloadgitlab-ce-6518c728acca65732f89a22a5cbbb75fe3f238f6.tar.gz
Small improvements to the dockerfile.
Diffstat (limited to 'docker')
-rw-r--r--docker/README.md4
-rw-r--r--docker/troubleshooting.md2
2 files changed, 3 insertions, 3 deletions
diff --git a/docker/README.md b/docker/README.md
index b88d570f082..537855624a6 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -55,9 +55,7 @@ sudo docker run --detach --name gitlab-ce --publish 8080:80 --publish 2222:22 sy
Troubleshoot with:
```
-sudo docker run -ti -e TERM=linux --name gitlab-ce --publish 8080:80 --publish 2222:22 sytse/gitlab-ce:7.10.1 bash
-/opt/gitlab/embedded/bin/runsvdir-start & gitlab-ctl reconfigure
-gitlab-ctl start
+sudo docker run -ti -e TERM=linux --name gitlab-ce-troubleshoot --publish 8080:80 --publish 2222:22 sytse/gitlab-ce:7.10.1 bash /usr/local/bin/wrapper
```
Build and use app and data images
diff --git a/docker/troubleshooting.md b/docker/troubleshooting.md
index 1b137922bf8..5827f2185db 100644
--- a/docker/troubleshooting.md
+++ b/docker/troubleshooting.md
@@ -62,6 +62,8 @@ free -m
```
+# Cleanup
+
Remove ALL docker containers and images (also non GitLab ones):
```