Commit da6e6709 authored by Kirill Smelkov's avatar Kirill Smelkov

X generating bin/gitlab-rails works

parent 3f7a76c5
#!/bin/sh
partition_forinst() {
# 2015-06-12 12:08:48 slapos[5354] INFO slappart3 slaprunner busy /srv/slapgrid/slappart16/srv/runner/project/slapos/software/gitlab/software.cfg RootSoftwareInstance gitlab1 - started
# gitlab1 -> slappart3
xslapos proxy show 2>&1 | grep -w $1 | awk '{print $5}'
}
xslapos node software -v --only-sr `pwd`/software.cfg --pidfile $HOME/var/run/slapgrid-sr.pid && \
xslapos node instance -v --only-cp `partition_forinst gitlab1` --pidfile $HOME/var/run/slapgrid-cp.pid
......@@ -4,7 +4,11 @@
parts =
directory
# promise TODO
publish-connection-parameters
# publish-connection-parameters
gitlab-rails
gitlab-rake
# std stuff for instance
eggs-directory = ${buildout:eggs-directory}
......@@ -38,7 +42,7 @@ promise = $${:etc}/promise
# gitlab-rake
[gitlab-bin]
recipe = slapos.cookbook:wrapper
wrapper-path = $${directory:bin}
wrapper-path = $${directory:bin}/$${:_buildout_section_name_}
environment =
BUNDLE_GEMFILE = ${gitlab-repository:location}/Gemfile
# HOME = ... (needed ?) better yes
......
......@@ -32,6 +32,9 @@ parts =
instance.cfg
# for instance
slapos-cookbook
#extends = https://lab.nexedi.cn/kirr/slapos/raw/master/software/helloworld/software.cfg
#extends = /home/kirr/src/wendelin/slapos/slapos/software/helloworld/software.cfg
......@@ -59,11 +62,12 @@ gems = fluentd fluent-plugin-wendelin
# bundler, that we'll use to
# - install gems for gitlab
# - run gitlan services / jobs (via `bundle exec ...`)
# - run gitlab services / jobs (via `bundle exec ...`)
#
# TODO say how this bundler/gitlab differ from usual slapos installation
[bundler-4gitlab]
recipe = rubygemsrecipe
# XXX ruby2.1 duplicated
ruby-executable = ${ruby2.1:location}/bin/ruby
gems = bundler
......@@ -76,8 +80,11 @@ bundle = ${buildout:bin-directory}/bundle
# impossible to adjust it later )
#
# Rugged needs: cmake, pkgconfig
# bundle exec <smth> ; <smth> starts with `#!/usr/bin/env ruby` as rubygems
#
environment =
PATH = ${cmake:location}/bin:${pkgconfig:location}/bin:%(PATH)s
# XXX ruby2.1 duplicated
PATH = ${ruby2.1:location}/bin:${cmake:location}/bin:${pkgconfig:location}/bin:%(PATH)s
......
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