diff options
Diffstat (limited to 'docker/Dockerfile')
| -rw-r--r-- | docker/Dockerfile | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 05521af6963..ad26d932d31 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -25,14 +25,16 @@ RUN mkdir -p /opt/gitlab/sv/sshd/supervise \ && ln -s /opt/gitlab/sv/sshd /opt/gitlab/service \ && mkdir -p /var/run/sshd -# Prepare default configuration -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 && \ - mkdir -p /assets/ && \ - cp /etc/gitlab/gitlab.rb /assets/gitlab.rb +# Copy assets +COPY assets/ /assets/ +RUN cat /assets/gitlab-docker.rb /etc/gitlab/gitlab.rb > /assets/gitlab.rb && \ + rm /etc/gitlab/gitlab.rb + +# Monkey patch missing initctl +COPY assets/initctl /sbin/initctl + +# Allow to access embedded tools +ENV PATH /opt/gitlab/embedded/bin:/opt/gitlab/bin:$PATH # Expose web & ssh EXPOSE 443 80 22 @@ -40,8 +42,5 @@ EXPOSE 443 80 22 # Define data volumes VOLUME ["/etc/gitlab", "/var/opt/gitlab", "/var/log/gitlab"] -# Copy assets -COPY assets/wrapper /usr/local/bin/ - # Wrapper to handle signal, trigger runit and reconfigure GitLab -CMD ["/usr/local/bin/wrapper"] +CMD ["/assets/wrapper"] |