diff options
author | Sytse (admin) <sytse+admin@gitlab.com> | 2015-03-26 23:47:00 +0000 |
---|---|---|
committer | Sytse (admin) <sytse+admin@gitlab.com> | 2015-03-26 23:47:00 +0000 |
commit | 708c39ff574024a42711718bdd40beb91d537259 (patch) | |
tree | b77a3c8fc35c3c7bda27ff46437ad4eacb261c08 /docker/Dockerfile | |
parent | 090f2344ecb6631b20df5853045536f1eb0589d3 (diff) | |
parent | 71e6871737bebbb7164f1c0853120cd209428259 (diff) | |
download | gitlab-ce-708c39ff574024a42711718bdd40beb91d537259.tar.gz |
Merge branch 'master' into 'master'
Separate Dockerfile for Data and Application
This is based on #1158
Instead of creating data container from same docker image, we create separate docker image for data container to avoid keeping original docker image after upgrading to new version. (That results in 1GB space that cannot be freed)
See merge request !409
Diffstat (limited to 'docker/Dockerfile')
-rw-r--r-- | docker/Dockerfile | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index f34cbc38a54..b228a66832a 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -26,11 +26,7 @@ RUN mkdir -p /opt/gitlab/sv/sshd/supervise \ # Expose web & ssh EXPOSE 80 22 -# Declare volumes -VOLUME ["/var/opt/gitlab", "/var/log/gitlab", "/etc/gitlab"] - # Copy assets -COPY assets/gitlab.rb /etc/gitlab/ COPY assets/wrapper /usr/local/bin/ # Wrapper to handle signal, trigger runit and reconfigure GitLab |