summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSytse Sijbrandij <sytse@gitlab.com>2015-05-07 10:47:24 +0200
committerSytse Sijbrandij <sytse@gitlab.com>2015-05-07 10:47:24 +0200
commit60887cf94904e10cd26246301d09a49be49ef5fa (patch)
treea8b20aa0925bb23789f72c26317877c9eb10cb77
parentb18dfc8d40269d3770a432ecf28416736f7bf8d7 (diff)
downloadgitlab-ce-60887cf94904e10cd26246301d09a49be49ef5fa.tar.gz
Remove the volumes from the single image to keep it simple.
-rw-r--r--.gitignore3
-rw-r--r--docker/README.md10
-rw-r--r--docker/single/marathon.json19
3 files changed, 6 insertions, 26 deletions
diff --git a/.gitignore b/.gitignore
index efd84a7dcc2..3e30fb8cf77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,6 +40,3 @@ rails_best_practices_output.html
/tags
tmp/
vendor/bundle/*
-var-log-gitlab/
-var-opt-gitlab/
-etc-gitlab/
diff --git a/docker/README.md b/docker/README.md
index 84e4655640b..82eac9cd0db 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -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`.
@@ -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:
@@ -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
```
@@ -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
diff --git a/docker/single/marathon.json b/docker/single/marathon.json
index b22b9f6274f..d23c2b84e0e 100644
--- a/docker/single/marathon.json
+++ b/docker/single/marathon.json
@@ -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"
- }
- ]
+ }
}
} \ No newline at end of file