Commit 5c827cf2 authored by Kirill Smelkov's avatar Kirill Smelkov

X Tweaks to run gitlab in development mode

parent 0e6efa5a
...@@ -64,6 +64,6 @@ $RAKE cache:clear || die "cache:clear failed" ...@@ -64,6 +64,6 @@ $RAKE cache:clear || die "cache:clear failed"
# 3. finally exec to unicorn # 3. finally exec to unicorn
exec {{ gitlab_unicorn }} \ exec {{ gitlab_unicorn }} \
-E production \ -E development \
-c {{ unicorn_rb.rendered }} \ -c {{ unicorn_rb.rendered }} \
{{ gitlab_work.location }}/config.ru {{ gitlab_work.location }}/config.ru
...@@ -285,7 +285,7 @@ wrapper-path = ${directory:bin}/${:_buildout_section_name_} ...@@ -285,7 +285,7 @@ wrapper-path = ${directory:bin}/${:_buildout_section_name_}
environment = environment =
BUNDLE_GEMFILE = {{ gitlab_repository_location }}/Gemfile BUNDLE_GEMFILE = {{ gitlab_repository_location }}/Gemfile
HOME = ${directory:home} HOME = ${directory:home}
RAILS_ENV = production RAILS_ENV = development
SIDEKIQ_MEMORY_KILLER_MAX_RSS = ${instance-parameter:configuration.sidekiq_memory_killer_max_rss} SIDEKIQ_MEMORY_KILLER_MAX_RSS = ${instance-parameter:configuration.sidekiq_memory_killer_max_rss}
# NOTE sys.argv[1:] implicitly appended # NOTE sys.argv[1:] implicitly appended
...@@ -525,6 +525,7 @@ command-line = {{ gitlab_workhorse }} ...@@ -525,6 +525,7 @@ command-line = {{ gitlab_workhorse }}
-listenAddr ${gitlab-workhorse:socket} -listenAddr ${gitlab-workhorse:socket}
-authSocket ${unicorn:socket} -authSocket ${unicorn:socket}
-documentRoot ${gitlab-work:location}/public -documentRoot ${gitlab-work:location}/public
-developmentMode
# NOTE for profiling # NOTE for profiling
# -pprofListenAddr ... # -pprofListenAddr ...
...@@ -647,7 +648,7 @@ command-line = ...@@ -647,7 +648,7 @@ command-line =
# XXX -q runner ? (present in gitlab-ce/Procfile but not in omnibus) # XXX -q runner ? (present in gitlab-ce/Procfile but not in omnibus)
# XXX -q pages -q elasticsearch ? (present in omnibus but not in gitlab-ce -- those features are gitlab-ee only) # XXX -q pages -q elasticsearch ? (present in omnibus but not in gitlab-ce -- those features are gitlab-ee only)
# XXX -P ? (pidfile) # XXX -P ? (pidfile)
-e production -e development
-r ${gitlab-work:location} -r ${gitlab-work:location}
-t ${instance-parameter:configuration.sidekiq_shutdown_timeout} -t ${instance-parameter:configuration.sidekiq_shutdown_timeout}
-c ${instance-parameter:configuration.sidekiq_concurrency} -c ${instance-parameter:configuration.sidekiq_concurrency}
......
...@@ -148,7 +148,9 @@ configure-command = cd ${:path} && ...@@ -148,7 +148,9 @@ configure-command = cd ${:path} &&
make-binary = make-binary =
make-targets= cd ${:path} && make-targets= cd ${:path} &&
${:bundle} install --deployment --without development test mysql kerberos ${:bundle} install --deployment --without test mysql kerberos
#${:bundle} install --deployment --without development test mysql kerberos
# build needed-by-gitlab-shell gems via bundler # build needed-by-gitlab-shell gems via bundler
...@@ -162,8 +164,9 @@ bundle = ${bundler-4gitlab:bundle} ...@@ -162,8 +164,9 @@ bundle = ${bundler-4gitlab:bundle}
configure-command = true configure-command = true
make-binary = make-binary =
make-targets= cd ${:path} && make-targets= cd ${:path} &&
${:bundle} install --deployment --without development test ${:bundle} install --deployment --without test
# ${:bundle} install --deployment --without development test
# build gitlab-workhorse # build gitlab-workhorse
[gitlab-workhorse] [gitlab-workhorse]
...@@ -289,3 +292,12 @@ plone.recipe.command = 1.1 ...@@ -289,3 +292,12 @@ plone.recipe.command = 1.1
rubygemsrecipe = 0.2.2 rubygemsrecipe = 0.2.2
slapos.recipe.template = 2.9 slapos.recipe.template = 2.9
z3c.recipe.scripts = 1.0.1 z3c.recipe.scripts = 1.0.1
[database.yml.in]
md5sum =
[gitlab-unicorn-startup.in]
md5sum =
[instance-gitlab.cfg.in]
md5sum =
[resque.yml.in]
md5sum =
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
{% from 'macrolib.cfg.in' import cfg with context %} {% from 'macrolib.cfg.in' import cfg with context %}
production: production: &base
adapter: postgresql adapter: postgresql
encoding: unicode encoding: unicode
{# collation is mainly for mysql {# collation is mainly for mysql
...@@ -25,3 +25,6 @@ production: ...@@ -25,3 +25,6 @@ production:
sslmode: <%= single_quote(@db_sslmode) %> sslmode: <%= single_quote(@db_sslmode) %>
sslrootcert: <%= single_quote(@db_sslrootcert) %> sslrootcert: <%= single_quote(@db_sslrootcert) %>
#} #}
development:
<<: *base
...@@ -4,4 +4,5 @@ ...@@ -4,4 +4,5 @@
# https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-cookbooks/gitlab/templates/default/resque.yml.erb # https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-cookbooks/gitlab/templates/default/resque.yml.erb
# (last udpdated for omnibus-gitlab 8.5.1+ce.0-1-ge732b39) # (last udpdated for omnibus-gitlab 8.5.1+ce.0-1-ge732b39)
production: unix://{{ redis.unixsocket }} production: &base unix://{{ redis.unixsocket }}
development: *base
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