Skip to content

Commit

Permalink
Remove the volumes from the single image to keep it simple.
Browse files Browse the repository at this point in the history
  • Loading branch information
dosire committed May 7, 2015
1 parent b18dfc8 commit 60887cf
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 26 deletions.
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,3 @@ rails_best_practices_output.html
/tags
tmp/
vendor/bundle/*
var-log-gitlab/
var-opt-gitlab/
etc-gitlab/
10 changes: 5 additions & 5 deletions docker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ After starting a container you can go to [http://localhost:8080/](http://localho

It might take a while before the docker container is responding to queries.

You can check the status with `sudo docker logs -f gitlab-ce`.
You can check the status with something like `sudo docker logs -f 7c10172d7705`.

You can login to the web interface with username `root` and password `5iveL!fe`.

Expand Down Expand Up @@ -43,10 +43,10 @@ sudo docker pull sytse/gitlab-ce:7.10.1
Run the image:

```bash
sudo docker run --detach --name gitlab-ce --publish 8080:80 --publish 2222:22 gitlab-ce
sudo docker run --detach --publish 8080:80 --publish 2222:22 sytse/gitlab-ce:7.10.1
```

After this you can login to the web interface as explained in 'After starting a container'
After this you can login to the web interface as explained above in 'After starting a container'.

Build the image:

Expand All @@ -63,7 +63,7 @@ sudo docker push sytse/gitlab-ce
Diagnosing commands:

```bash
docker run -i -t -v `pwd`/var-opt-gitlab:/var/opt/gitlab -v `pwd`/var-log-gitlab:/var/log/gitlab -v `pwd`/etc-gitlab:/etc/gitlab sytse/gitlab-ce:7.10.1
sudo docker run -i -t sytse/gitlab-ce:7.10.1
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
```

Expand All @@ -83,7 +83,7 @@ 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
```

Now please refer to the section above 'After starting a container'.
After this you can login to the web interface as explained above in 'After starting a container'.

### Build images

Expand Down
19 changes: 1 addition & 18 deletions docker/single/marathon.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,6 @@
"docker": {
"network": "HOST",
"image": "sytse/gitlab-ce:7.10.1"
},
"volumes": [
{
"containerPath": "/var/opt/gitlab",
"hostPath": "/var/opt/gitlab",
"mode": "RW"
},
{
"containerPath": "/var/log/gitlab",
"hostPath": "/var/log/gitlab",
"mode": "RW"
},
{
"containerPath": "/etc/gitlab",
"hostPath": "/etc/gitlab",
"mode": "RW"
}
]
}
}
}

0 comments on commit 60887cf

Please sign in to comment.