Commit 97334b6e authored by Jacob Vosmaer's avatar Jacob Vosmaer

Use one Procfile and bootstrap during 'make'

parent 113f297f
......@@ -47,6 +47,7 @@ gitlab-shell/.git:
gitlab-shell/config.yml:
sed -e "s|/home/git|${gitlab_development_root}|"\
-e "s|^gitlab_url:.*|gitlab_url: http+unix://${shell echo ${gitlab_development_root}/gitlab.socket | sed 's|/|%2F|g'}|"\
-e "s|:8080/|:3000|"\
-e "s|/usr/bin/redis-cli|$(shell which redis-cli)|"\
-e "s|^ socket: .*| socket: ${gitlab_development_root}/redis/redis.socket|"\
......@@ -122,6 +123,7 @@ postgresql: postgresql/data/PG_VERSION
postgresql/data/PG_VERSION:
${postgres_bin_dir}/initdb --locale=C -E utf-8 postgresql/data
support/bootstrap-rails
postgresql-replication/cluster:
${postgres_bin_dir}/initdb --locale=C -E utf-8 postgresql-replica/data
......
......@@ -3,3 +3,5 @@ postgresql: postgres -D /home/git/postgresql/data -k /home/git/postgresql -h ''
#postgresql-replica: postgres -D /home/git/postgresql-replica/data -k /home/git/postgresql-replica -h ''
#openldap: cd gitlab-openldap && libexec/slapd -F slapd.d -d2 -h "ldap://127.0.0.1:3890"
gitlab-workhorse: /home/git/gitlab-workhorse/gitlab-workhorse -authSocket /home/git/gitlab.socket -listenAddr localhost:3000 -documentRoot /home/git/gitlab/public -developmentMode
rails-web: cd gitlab && BUNDLE_GEMFILE=Gemfile RAILS_ENV=development bin/web start_foreground
rails-background-jobs: cd gitlab && BUNDLE_GEMFILE=Gemfile RAILS_ENV=development bin/background_jobs start_foreground
......@@ -263,21 +263,12 @@ If you are going to work on Gitlab Geo, you will need [PostgreSQL replication](#
## Post-installation
Start required services: Redis, PostgreSQL and GitLab-Workhorse by running
the command below in the root of the gitlab-development-kit project:
Start GitLab and all required services:
bundle exec foreman start
Next, keep the above command running and install the required gems, seed the main GitLab database, and setup GitLab from a new terminal session:
cd gitlab && bundle install && bundle exec rake db:create dev:setup
Finally, start the main GitLab rails application in the gitlab subdirectory of the project:
bundle exec foreman start -p4000
This will run Foreman on port 4000. Gitlab-workhorse is already running on port 3000, hence to login to GitLab you may now
go to http://localhost:3000 in your browser. The development login credentials are `root` and `5iveL!fe`.
To access GitLab you may now go to http://localhost:3000 in your
browser. The development login credentials are `root` and `5iveL!fe`.
If you want to work on GitLab CI - setup the GitLab Runner:
......@@ -488,7 +479,7 @@ is Homebrew on OS X, which encourages frequent updates (`brew update && brew
upgrade`) which may break binary compatibility.
```
bundle exec rake db:create gitlab:setup
bundle exec rake db:create dev:setup
rake aborted!
LoadError: dlopen(/Users/janedoe/.rbenv/versions/2.1.2/lib/ruby/gems/2.1.0/extensions/x86_64-darwin-13/2.1.0-static/charlock_holmes-0.6.9.4/charlock_holmes/charlock_holmes.bundle, 9): Library not loaded: /usr/local/opt/icu4c/lib/libicui18n.52.1.dylib
Referenced from: /Users/janedoe/.rbenv/versions/2.1.2/lib/ruby/gems/2.1.0/extensions/x86_64-darwin-13/2.1.0-static/charlock_holmes-0.6.9.4/charlock_holmes/charlock_holmes.bundle
......
#!/usr/bin/env ruby
begin
foreman_pid = spawn(*%W(bundle exec foreman start -c all=0,redis=1,postgresql=1))
system({'force' => 'yes'}, *%W(bundle exec rake db:create dev:setup), chdir: 'gitlab')
ensure
Process.kill('TERM', foreman_pid)
end
\ No newline at end of file
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