Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kirill Smelkov
slapos
Commits
da6e6709
Commit
da6e6709
authored
Jun 12, 2015
by
Kirill Smelkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
X generating bin/gitlab-rails works
parent
3f7a76c5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
4 deletions
+25
-4
software/gitlab/build.sh
software/gitlab/build.sh
+10
-0
software/gitlab/instance.cfg.in
software/gitlab/instance.cfg.in
+6
-2
software/gitlab/software.cfg
software/gitlab/software.cfg
+9
-2
No files found.
software/gitlab/build.sh
0 → 100755
View file @
da6e6709
#!/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
software/gitlab/instance.cfg.in
View file @
da6e6709
...
...
@@ -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
...
...
software/gitlab/software.cfg
View file @
da6e6709
...
...
@@ -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 gitla
n
services / jobs (via `bundle exec ...`)
# - run gitla
b
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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment