Commit e62b5797 authored by Kamil Trzciński's avatar Kamil Trzciński

Merge branch 'docker-image' into 'master'

Fix docker image

See merge request !979
parents 997a3b1d 753f34c8
...@@ -30,7 +30,9 @@ RUN ( \ ...@@ -30,7 +30,9 @@ RUN ( \
echo "" && \ echo "" && \
echo "# Docker options" && \ echo "# Docker options" && \
echo "# Prevent Postgres from trying to allocate 25% of total memory" && \ 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 web & ssh
EXPOSE 443 80 22 EXPOSE 443 80 22
......
...@@ -13,4 +13,9 @@ function entrypoint() { ...@@ -13,4 +13,9 @@ function entrypoint() {
gitlab-ctl tail # tail all logs 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 entrypoint
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment