4 files changed, 33 insertions, 10 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 86f6c896a6d..05521af6963 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -30,7 +30,9 @@ RUN ( \
   echo "" && \
   echo "# Docker options" && \
   echo "# Prevent Postgres from trying to allocate 25% of total memory" && \
-  echo "postgresql['shared_buffers'] = '1MB'" ) >> /etc/gitlab/gitlab.rb
+  echo "postgresql['shared_buffers'] = '1MB'" ) >> /etc/gitlab/gitlab.rb && \
+  mkdir -p /assets/ && \
+  cp /etc/gitlab/gitlab.rb /assets/gitlab.rb
 
 # Expose web & ssh
 EXPOSE 443 80 22
diff --git a/docker/README.md b/docker/README.md
index 9cd48bf87d4..23093d35759 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -1,9 +1,6 @@
 # GitLab Docker images
 
-## What is GitLab?
-
-GitLab offers git repository management, code reviews, issue tracking, activity feeds, wikis. It has LDAP/AD integration, handles 25,000 users on a single server but can also run on a highly available active/active cluster.
-Learn more on [https://about.gitlab.com](https://about.gitlab.com)
+The GitLab docker image is [available on Docker Hub](https://registry.hub.docker.com/u/gitlab/gitlab-ce/).
 
 ## After starting a container
 
@@ -13,7 +10,7 @@ It might take a while before the docker container is responding to queries.
 
 You can check the status with something like `sudo docker logs -f gitlab`.
 
-You can login to the web interface with username `root` and password `password`.
+You can login to the web interface with username `root` and password `5iveL!fe`.
 
 Next time, you can just use docker start and stop to run the container.
 
@@ -97,12 +94,12 @@ To upgrade GitLab to new version you have to do:
 sudo docker stop gitlab
 ```
 
-1. stop running container, 
+1. stop running container,
 ```bash
 sudo docker rm gitlab
 ```
 
-1. remove existing container, 
+1. remove existing container,
 ```bash
 sudo docker pull gitlab/gitlab-ce:latest
 ```
@@ -166,3 +163,5 @@ sudo docker push gitlab/gitlab-ce:latest
 ## Troubleshooting
 
 Please see the [troubleshooting](troubleshooting.md) file in this directory.
+
+Note: We use `fig.yml` to have compatibility with fig and because docker-compose also supports it.
diff --git a/docker/assets/wrapper b/docker/assets/wrapper
index 966b2cab4a1..8bc8370fbc9 100755
--- a/docker/assets/wrapper
+++ b/docker/assets/wrapper
@@ -13,4 +13,9 @@ function entrypoint() {
     gitlab-ctl tail # tail all logs
 }
 
+if [[ ! -e /etc/gitlab/gitlab.rb ]]; then
+	cp /assets/gitlab.rb /etc/gitlab/gitlab.rb
+	chmod 0600 /etc/gitlab/gitlab.rb
+fi
+
 entrypoint
diff --git a/docker/marathon.json b/docker/marathon.json
index d23c2b84e0e..9b2091a8c22 100644
--- a/docker/marathon.json
+++ b/docker/marathon.json
@@ -8,7 +8,24 @@
     "type": "DOCKER",
     "docker": {
       "network": "HOST",
-      "image": "sytse/gitlab-ce:7.10.1"
-    }
+      "image": "gitlab/gitlab-ce:latest"
+    },
+    "volumes": [
+      {
+          "containerPath": "/etc/gitlab",
+          "hostPath": "/var/data/etc/gitlab",
+          "mode": "RW"
+      },
+      {
+          "containerPath": "/var/opt/gitlab",
+          "hostPath": "/var/data/opt/gitlab",
+          "mode": "RW"
+      },
+      {
+          "containerPath": "/var/log/gitlab",
+          "hostPath": "/var/data/log/gitlab",
+          "mode": "RW"
+      }
+    ]
   }
 }
 \ No newline at end of file