summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2015-07-14 19:46:51 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2015-07-14 19:46:55 +0200
commit753f34c8fa91e0caa9a305d49c28ef6dd9447be2 (patch)
treec6d93550b1f047c71efe318e07ef082e19724865 /docker
parent997a3b1d872f6b6b198582677acd67595bb15029 (diff)
downloadgitlab-ce-753f34c8fa91e0caa9a305d49c28ef6dd9447be2.tar.gz
Fix docker imagedocker-image
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile4
-rwxr-xr-xdocker/assets/wrapper5
2 files changed, 8 insertions, 1 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/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