Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
92
Merge Requests
92
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos
Commits
57bfca0a
Commit
57bfca0a
authored
Mar 19, 2024
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move libgit2 to component
parent
b2e76055
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
45 deletions
+8
-45
software/gitlab/instance-gitlab.cfg.in
software/gitlab/instance-gitlab.cfg.in
+2
-2
software/gitlab/software.cfg
software/gitlab/software.cfg
+6
-43
No files found.
software/gitlab/instance-gitlab.cfg.in
View file @
57bfca0a
...
...
@@ -687,8 +687,8 @@ copytruncate = true
[logrotate-entry-gitlab-workhorse]
<= logrotate-entry-base
log = ${gitlab-workhorse-dir:log}/
/
*.log
name = gitlab-
shell
log = ${gitlab-workhorse-dir:log}/*.log
name = gitlab-
workhorse
copytruncate = true
#######################################
...
...
software/gitlab/software.cfg
View file @
57bfca0a
...
...
@@ -5,6 +5,7 @@ extends =
../../stack/slapos.cfg
../../stack/nodejs.cfg
../../stack/monitor/buildout.cfg
../../component/libgit2/buildout.cfg
../../component/ruby/buildout.cfg
../../component/golang/buildout.cfg
../../component/postgresql/buildout.cfg
...
...
@@ -29,8 +30,6 @@ extends =
../../component/dcron/buildout.cfg
../../component/logrotate/buildout.cfg
../../component/pcre2/buildout.cfg
parts =
golang1.15
git
...
...
@@ -60,7 +59,6 @@ parts =
gzip
dcron-output
logrotate
libgit2
[slapos.cookbook-repository]
revision = 571d6514f7290e8faa9439c4b86aa2f6c87df261
...
...
@@ -70,6 +68,11 @@ revision = 571d6514f7290e8faa9439c4b86aa2f6c87df261
[yarn]
<= yarn-1.16.0
[libgit2]
# This version is for rugged 1.1.0 needed by gitlab and gitaly 13.12.15,
# see: https://github.com/libgit2/rugged/tree/v1.1.0/vendor
version = 1.1.0
############################
# Software compilation #
############################
...
...
@@ -144,15 +147,6 @@ environment =
PATH = ${python-4gitlab:bin}:${yarn:location}/bin:${:ruby-location}/bin:${cmake:location}/bin:${pkgconfig:location}/bin:${nodejs:location}/bin:${postgresql:location}/bin:${redis:location}/bin:${git:location}/bin:${buildout:bin-directory}:%(PATH)s
[bundler-4gitlab-x]
recipe = slapos.cookbook:wrapper
command-line = ${bundler-4gitlab-build:bundle1.17.3}/bundle
wrapper-path = ${buildout:bin-directory}/bundle1.17.3
bundle = ${:wrapper-path}
bundle1.17.3 = ${bundler-4gitlab-build:bundle1.17.3}
environment = ${bundler-4gitlab-build:environment}
ruby-location = ${ruby:location}
# gitlab, gitlab-shell & gitlab-workhorse checked out as git repositories
# pinned to exact commit
...
...
@@ -179,36 +173,6 @@ repository = https://gitlab.com/gitlab-org/gitaly.git
revision = v13.12.15
location = ${buildout:parts-directory}/gitaly
#[gitlab-workhorse-repository]
#<= git-repository
#repository = https://lab.nexedi.com/nexedi/gitlab-workhorse.git
#revision = v8.30.3-19-g919c9b532c
[libgit2]
recipe = slapos.recipe.cmmi
url = https://github.com/libgit2/libgit2/archive/${:revision}.tar.gz
# This revision is for rugged 1.1.0 needed by gitlab and gitaly 13.12.15,
# see: https://github.com/libgit2/rugged/tree/v1.1.0/vendor
revision = 7f4fa178629d559c037a1f72f79f79af9c1ef8ce
md5sum =
configure-command =
cmake
configure-options =
-Bbuild
-DCMAKE_BUILD_TYPE=Release
-DCMAKE_INSTALL_PREFIX=@@LOCATION@@
-DCMAKE_C_FLAGS="${:CMAKE_CFLAGS}"
-DCMAKE_INSTALL_RPATH=${:CMAKE_LIBRARY_PATH}
-G"Unix Makefiles"
make-options = -C build
environment =
PKG_CONFIG_PATH=${openssl-1.0:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig:${xz-utils:location}/lib/pkgconfig
PATH=${pkgconfig:location}/bin:${cmake:location}/bin:%(PATH)s
LDFLAGS=-L${openssl-1.0:location}/lib -Wl,-rpath=${openssl-1.0:location}/lib -L${pcre:location}/lib -Wl,-rpath=${pcre:location}/lib
CMAKE_CFLAGS = -I${openssl-1.0:location}/include -I${zlib:location}/include -I${pcre:location}/include
CMAKE_LIBRARY_PATH=${zlib:location}/lib:${openssl-1.0:location}/lib:${pcre:location}/lib
# build needed-by-gitlab gems via bundler
[gitlab/vendor/bundle]
recipe = slapos.recipe.cmmi
...
...
@@ -315,7 +279,6 @@ environment =
PKG_CONFIG_PATH=${openssl-1.0:location}/lib/pkgconfig:${icu:location}/lib/pkgconfig:${libgit2:location}/lib/pkgconfig
PATH=${cmake:location}/bin:${pkgconfig:location}/bin:${ruby:location}/bin:%(PATH)s
OPENSSL_ROOT_DIR=${openssl-1.0:location}
LDFLAGS = -L${openssl-1.0:location}/lib -Wl,-rpath=${openssl-1.0:location}/lib
[xnice-repository]
# to get kirr's misc repo containing xnice script for executing processes
...
...
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