summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSytse Sijbrandij <sytse@gitlab.com>2015-06-11 18:06:27 +0200
committerSytse Sijbrandij <sytse@gitlab.com>2015-06-11 18:06:27 +0200
commit8362293025ddd3636af03517ebd24ac99fe08354 (patch)
treea07c1f895d6e89828a75a0484319f231aa72fad4
parenta7a4ae69d429bae31fdd6f97b462b635b460482d (diff)
parent0b09436d678b1df3b9b4eb8b802a77ecdb6e6d1a (diff)
downloadgitlab-ce-8362293025ddd3636af03517ebd24ac99fe08354.tar.gz
Merge branch 'master' of github.com:gitlabhq/gitlabhq
-rw-r--r--docker/README.md10
1 files changed, 5 insertions, 5 deletions
diff --git a/docker/README.md b/docker/README.md
index 46b21348364..3edce5ef561 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -80,7 +80,7 @@ sudo docker pull sytse/gitlab-app:7.10.1
```bash
sudo docker run --name gitlab-data sytse/gitlab-data /bin/true
-sudo docker run --detach --name gitlab_app --publish 8080:80 --publish 2222:22 --volumes-from gitlab_data sytse/gitlab-app:7.10.1
+sudo docker run --detach --name gitlab-app --publish 8080:80 --publish 2222:22 --volumes-from gitlab-data sytse/gitlab-app:7.10.1
```
After this you can login to the web interface as explained above in 'After starting a container'.
@@ -130,7 +130,7 @@ It Assumes that you're upgrading from 7.8.1 to 7.10.1 and you're in the updated
sudo docker stop gitlab-app
sudo docker rm gitlab-app
sudo docker build --tag gitlab-app:7.10.1 docker/app/
-sudo docker run --detach --name gitlab-app --publish 8080:80 --publish 2222:22 --volumes-from gitlab_data gitlab-app:7.10.1
+sudo docker run --detach --name gitlab-app --publish 8080:80 --publish 2222:22 --volumes-from gitlab-data gitlab-app:7.10.1
```
On the first run GitLab will reconfigure and update itself. If everything runs OK don't forget to cleanup the app image:
@@ -143,13 +143,13 @@ sudo docker rmi gitlab-app:7.8.1
- Ensure the containers are running
- Login to Dockerhub with `sudo docker login`
-- Run the following (replace '7.9.2' with the version you're using and 'Sytse Sijbrandij' with your name):
+- Run the following (replace '7.10.1' with the version you're using and 'Sytse Sijbrandij' with your name):
```bash
sudo docker commit -m "Initial commit" -a "Sytse Sijbrandij" gitlab-app sytse/gitlab-app:7.10.1
sudo docker push sytse/gitlab-app:7.10.1
-sudo docker commit -m "Initial commit" -a "Sytse Sijbrandij" gitlab_data sytse/gitlab_data
-sudo docker push sytse/gitlab_data
+sudo docker commit -m "Initial commit" -a "Sytse Sijbrandij" gitlab-data sytse/gitlab-data
+sudo docker push sytse/gitlab-data
```
## Troubleshooting