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
103
Merge Requests
103
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
7664238e
Commit
7664238e
authored
Jun 04, 2020
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
upgrade to gitlab 13.0
parent
45f2dd4b
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
88 additions
and
23 deletions
+88
-23
software/gitlab/buildout.hash.cfg
software/gitlab/buildout.hash.cfg
+3
-3
software/gitlab/instance-gitlab.cfg.in
software/gitlab/instance-gitlab.cfg.in
+3
-2
software/gitlab/instance.cfg.in
software/gitlab/instance.cfg.in
+2
-1
software/gitlab/software.cfg
software/gitlab/software.cfg
+22
-12
software/gitlab/template/gitaly-config.toml.in
software/gitlab/template/gitaly-config.toml.in
+58
-5
No files found.
software/gitlab/buildout.hash.cfg
View file @
7664238e
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
# not need these here).
# not need these here).
[instance.cfg]
[instance.cfg]
filename = instance.cfg.in
filename = instance.cfg.in
md5sum = d
c3f318e8a3aa7a59f9394118543e9e3
md5sum = d
80a8052157b5781129353039c61bfff
[watcher]
[watcher]
_update_hash_filename_ = watcher.in
_update_hash_filename_ = watcher.in
...
@@ -50,11 +50,11 @@ md5sum = bedbfc03eaf3560a93cfde1f497e99f6
...
@@ -50,11 +50,11 @@ md5sum = bedbfc03eaf3560a93cfde1f497e99f6
[gitaly-config.toml.in]
[gitaly-config.toml.in]
_update_hash_filename_ = template/gitaly-config.toml.in
_update_hash_filename_ = template/gitaly-config.toml.in
md5sum =
056d7ed09e1bf20d022d3ef6b9363e00
md5sum =
96d597d5f344dadfe9fb4bdc5ae1f2b2
[instance-gitlab.cfg.in]
[instance-gitlab.cfg.in]
_update_hash_filename_ = instance-gitlab.cfg.in
_update_hash_filename_ = instance-gitlab.cfg.in
md5sum =
52abdcb629c513cfa1c31d47ac082c16
md5sum =
1b96d49767f925afc53df6960614eebb
[instance-gitlab-export.cfg.in]
[instance-gitlab-export.cfg.in]
_update_hash_filename_ = instance-gitlab-export.cfg.in
_update_hash_filename_ = instance-gitlab-export.cfg.in
...
...
software/gitlab/instance-gitlab.cfg.in
View file @
7664238e
...
@@ -276,6 +276,7 @@ rendered= ${directory:etc}/${:_buildout_section_name_}
...
@@ -276,6 +276,7 @@ rendered= ${directory:etc}/${:_buildout_section_name_}
context-extra =
context-extra =
import urllib urllib
import urllib urllib
section gitlab gitlab
section gitlab gitlab
section gitlab_shell gitlab-shell
section gitlab_shell_work gitlab-shell-work
section gitlab_shell_work gitlab-shell-work
section gitaly gitaly
section gitaly gitaly
...
@@ -565,7 +566,7 @@ command-line = {{ gitlab_workhorse }}
...
@@ -565,7 +566,7 @@ command-line = {{ gitlab_workhorse }}
-documentRoot ${gitlab-work:location}/public
-documentRoot ${gitlab-work:location}/public
-secretPath ${gitlab-workhorse:secret}
-secretPath ${gitlab-workhorse:secret}
-logFile ${gitlab-workhorse:log}
-logFile ${gitlab-workhorse:log}
-repoPath ${gitlab-repo-dir:repositories}
#
-repoPath ${gitlab-repo-dir:repositories}
# NOTE for profiling
# NOTE for profiling
# -pprofListenAddr ...
# -pprofListenAddr ...
...
@@ -816,11 +817,11 @@ cron-entries = ${cron:cron-entries}
...
@@ -816,11 +817,11 @@ cron-entries = ${cron:cron-entries}
[service-gitaly]
[service-gitaly]
recipe = slapos.cookbook:wrapper
recipe = slapos.cookbook:wrapper
wrapper-path = ${directory:service}/gitaly
wrapper-path = ${directory:service}/gitaly
#command-line = ${gitlab-work:location}/bin/daemon_with_pidfile ${gitaly:pid}
command-line = {{ gitaly_location }}/gitaly ${gitaly-config.toml:rendered}
command-line = {{ gitaly_location }}/gitaly ${gitaly-config.toml:rendered}
environment =
environment =
PATH={{ bundler_1_17_3_dir }}:{{ ruby_location }}/bin:/bin:/usr/bin
PATH={{ bundler_1_17_3_dir }}:{{ ruby_location }}/bin:/bin:/usr/bin
LD_LIBRARY_PATH={{ gcc_location }}/lib:{{ gcc_location }}/lib64
# 6. on-reinstantiate actions
# 6. on-reinstantiate actions
...
...
software/gitlab/instance.cfg.in
View file @
7664238e
...
@@ -51,10 +51,11 @@ context =
...
@@ -51,10 +51,11 @@ context =
raw grep_location ${grep:location}
raw grep_location ${grep:location}
raw gzip_bin ${gzip:location}/bin/gzip
raw gzip_bin ${gzip:location}/bin/gzip
raw gzip_location ${gzip:location}
raw gzip_location ${gzip:location}
raw gcc_location ${gcc-8.2:location}
raw logrotate_bin ${logrotate:location}/usr/sbin/logrotate
raw logrotate_bin ${logrotate:location}/usr/sbin/logrotate
raw nginx_bin ${nginx-output:nginx}
raw nginx_bin ${nginx-output:nginx}
raw nginx_mime_types ${nginx-output:mime}
raw nginx_mime_types ${nginx-output:mime}
raw node_bin_location ${nodejs-
8.12
.0:location}/bin/
raw node_bin_location ${nodejs-
10.19
.0:location}/bin/
raw openssl_bin ${openssl-output:openssl}
raw openssl_bin ${openssl-output:openssl}
raw postgresql_location ${postgresql10:location}
raw postgresql_location ${postgresql10:location}
raw redis_binprefix ${redis28:location}/bin
raw redis_binprefix ${redis28:location}/bin
...
...
software/gitlab/software.cfg
View file @
7664238e
...
@@ -30,7 +30,7 @@ extends =
...
@@ -30,7 +30,7 @@ extends =
parts =
parts =
ruby2.6
ruby2.6
golang1.1
2
golang1.1
3
git
git
postgresql10
postgresql10
redis28
redis28
...
@@ -128,7 +128,7 @@ bundle1.17.3 = ${buildout:parts-directory}/${:_buildout_section_name_}/lib/ruby/
...
@@ -128,7 +128,7 @@ bundle1.17.3 = ${buildout:parts-directory}/${:_buildout_section_name_}/lib/ruby/
# gitlab (via github-markup) wants to convert rst -> html via running: python3 (with docutils egg)
# gitlab (via github-markup) wants to convert rst -> html via running: python3 (with docutils egg)
environment =
environment =
PATH = ${python-4gitlab:bin}:${yarn:location}/bin:${:ruby-location}/bin:${cmake:location}/bin:${pkgconfig:location}/bin:${nodejs-
8.12
.0:location}/bin:${postgresql10:location}/bin:${redis28:location}/bin:${git:location}/bin:${buildout:bin-directory}:%(PATH)s
PATH = ${python-4gitlab:bin}:${yarn:location}/bin:${:ruby-location}/bin:${cmake:location}/bin:${pkgconfig:location}/bin:${nodejs-
10.19
.0:location}/bin:${postgresql10:location}/bin:${redis28:location}/bin:${git:location}/bin:${buildout:bin-directory}:%(PATH)s
# gitlab, gitlab-shell & gitlab-workhorse checked out as git repositories
# gitlab, gitlab-shell & gitlab-workhorse checked out as git repositories
...
@@ -139,30 +139,37 @@ git-executable = ${git:location}/bin/git
...
@@ -139,30 +139,37 @@ git-executable = ${git:location}/bin/git
[gitlab-repository]
[gitlab-repository]
<= git-repository
<= git-repository
repository = https://lab.nexedi.com/nexedi/gitlab-ce.git
#repository = https://lab.nexedi.com/nexedi/gitlab-ce.git
repository = https://gitlab.com/gitlab-org/gitlab-foss.git
# 11.11.8 + NXD patches:
# 11.11.8 + NXD patches:
revision = v11.11.8-7-g193b94c3e2
#revision = v11.11.8-7-g193b94c3e2
revision = v13.0.3-0-ge2397fc
location = ${buildout:parts-directory}/gitlab
location = ${buildout:parts-directory}/gitlab
[gitlab-shell-repository]
[gitlab-shell-repository]
<= git-repository
<= git-repository
#repository = https://gitlab.com/gitlab-org/gitlab-shell.git
repository = https://gitlab.com/gitlab-org/gitlab-shell.git
repository = https://gitlab.com/gitlab-org/gitlab-shell.git
# gitlab 11.11.8 wants gitlab-shell 9.1.0
# gitlab 11.11.8 wants gitlab-shell 9.1.0
revision = v9.1.0-0-g0e3052be56
#revision = v9.1.0-0-g0e3052be56
revision = v13.2.0
location = ${buildout:parts-directory}/gitlab-shell
location = ${buildout:parts-directory}/gitlab-shell
[gitaly-repository]
[gitaly-repository]
<= git-repository
<= git-repository
repository = https://gitlab.com/gitlab-org/gitaly.git
repository = https://gitlab.com/gitlab-org/gitaly.git
# gitaly version v1.42.7 (gitlab 11.11.8)
# gitaly version v1.42.7 (gitlab 11.11.8)
revision = v1.42.7-0-ge47c816beb
#revision = v1.42.7-0-ge47c816beb
revision = v13.0.3
location = ${buildout:parts-directory}/gitaly
location = ${buildout:parts-directory}/gitaly
[gitlab-workhorse-repository]
[gitlab-workhorse-repository]
<= git-repository
<= git-repository
repository = https://lab.nexedi.com/nexedi/gitlab-workhorse.git
#repository = https://lab.nexedi.com/nexedi/gitlab-workhorse.git
revision = v8.7.0-11-gfc590d3581
repository = https://gitlab.com/gitlab-org/gitlab-workhorse.git
#revision = v8.7.0-11-gfc590d3581
#revision = a2c07d3068717158ad710304a51062d7de24f37d
#revision = a2c07d3068717158ad710304a51062d7de24f37d
revision = v8.31.1
# build needed-by-gitlab gems via bundler
# build needed-by-gitlab gems via bundler
[gitlab/vendor/bundle]
[gitlab/vendor/bundle]
...
@@ -200,7 +207,7 @@ make-binary =
...
@@ -200,7 +207,7 @@ make-binary =
make-targets= cd ${:path} && npm install
make-targets= cd ${:path} && npm install
environment =
environment =
PATH=${nodejs-
8.12
.0:location}/bin/:%(PATH)s
PATH=${nodejs-
10.19
.0:location}/bin/:%(PATH)s
#our go infrastructure not currently supporting submodules, IIRC
#our go infrastructure not currently supporting submodules, IIRC
# https://lab.nexedi.com/nexedi/slapos/merge_requests/337
# https://lab.nexedi.com/nexedi/slapos/merge_requests/337
...
@@ -215,7 +222,7 @@ make-targets= cd ${go_github.com_libgit2_git2go:location}
...
@@ -215,7 +222,7 @@ make-targets= cd ${go_github.com_libgit2_git2go:location}
&& make install
&& make install
environment =
environment =
PKG_CONFIG_PATH=${openssl-1.0:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig
PKG_CONFIG_PATH=${openssl-1.0:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig
PATH=${cmake:location}/bin:${pkgconfig:location}/bin:${git:location}/bin:${golang1.1
2
:location}/bin:${buildout:bin-directory}:%(PATH)s
PATH=${cmake:location}/bin:${pkgconfig:location}/bin:${git:location}/bin:${golang1.1
3
:location}/bin:${buildout:bin-directory}:%(PATH)s
GOPATH=${gowork:directory}
GOPATH=${gowork:directory}
[gowork.goinstall]
[gowork.goinstall]
...
@@ -223,7 +230,7 @@ git2go = ${go_github.com_libgit2_git2go_prepare:path}/vendor/libgit2/install
...
@@ -223,7 +230,7 @@ git2go = ${go_github.com_libgit2_git2go_prepare:path}/vendor/libgit2/install
command = bash -c ". ${gowork:env.sh} && CGO_CFLAGS=-I${:git2go}/include CGO_LDFLAGS='-L${:git2go}/lib -lgit2' go install ${gowork:buildflags} -v $(echo -n '${gowork:install}' |tr '\n' ' ')"
command = bash -c ". ${gowork:env.sh} && CGO_CFLAGS=-I${:git2go}/include CGO_LDFLAGS='-L${:git2go}/lib -lgit2' go install ${gowork:buildflags} -v $(echo -n '${gowork:install}' |tr '\n' ' ')"
[gowork]
[gowork]
golang = ${golang1.1
2
:location}
golang = ${golang1.1
3
:location}
# gitlab.com/gitlab-org/gitlab-workhorse
# gitlab.com/gitlab-org/gitlab-workhorse
# gitlab.com/gitlab-org/gitlab-workhorse/cmd/gitlab-zip-cat
# gitlab.com/gitlab-org/gitlab-workhorse/cmd/gitlab-zip-cat
# gitlab.com/gitlab-org/gitlab-workhorse/cmd/gitlab-zip-metadata
# gitlab.com/gitlab-org/gitlab-workhorse/cmd/gitlab-zip-metadata
...
@@ -260,6 +267,9 @@ configure-command = cd ${:path}/ruby &&
...
@@ -260,6 +267,9 @@ configure-command = cd ${:path}/ruby &&
make-binary =
make-binary =
make-targets =
make-targets =
. ${gowork:env.sh} && make
. ${gowork:env.sh} && make
post-install =
# solve the problem error="not executable: ruby/git-hooks/pre-receive"
chmod 755 ${:path}/ruby/git-hooks/gitlab-shell-hook
environment =
environment =
PKG_CONFIG_PATH=${openssl-1.0:location}/lib/pkgconfig:${icu:location}/lib/pkgconfig
PKG_CONFIG_PATH=${openssl-1.0:location}/lib/pkgconfig:${icu:location}/lib/pkgconfig
PATH=${pkgconfig:location}/bin:${ruby2.6:location}/bin:%(PATH)s
PATH=${pkgconfig:location}/bin:${ruby2.6:location}/bin:%(PATH)s
...
@@ -285,7 +295,7 @@ configure-command = true
...
@@ -285,7 +295,7 @@ configure-command = true
make-binary =
make-binary =
make-targets= cd ${:path} &&
make-targets= cd ${:path} &&
# Compile go binary
# Compile go binary
. ${gowork:env.sh} &&
bin/
compile &&
. ${gowork:env.sh} &&
make
compile &&
${:bundle} install --deployment --without development test
${:bundle} install --deployment --without development test
environment =
environment =
PATH=${ruby2.6:location}/bin:%(PATH)s
PATH=${ruby2.6:location}/bin:%(PATH)s
...
...
software/gitlab/template/gitaly-config.toml.in
View file @
7664238e
...
@@ -14,10 +14,24 @@ bin_dir = "{{ gitaly.location }}"
...
@@ -14,10 +14,24 @@ bin_dir = "{{ gitaly.location }}"
# # Optional: export metrics via Prometheus
# # Optional: export metrics via Prometheus
# prometheus_listen_addr = "localhost:9236"
# prometheus_listen_addr = "localhost:9236"
# # Optional: configure where the Gitaly creates the sockets for internal connections. If unset, Gitaly will create a randomly
# # named temp directory each time it boots.
# # Non Gitaly clients should never connect to these sockets.
internal_socket_dir = "{{ gitaly.internal_socket }}"
# # Git settings
# # Optional: authenticate Gitaly requests using a shared secret
# [auth]
# token = 'abc123secret'
# transitioning = false # Set `transitioning` to true to temporarily allow unauthenticated while rolling out authentication.
# [tls]
# certificate_path = '/home/git/cert.cert'
# key_path = '/home/git/key.pem'
# Git settings
[git]
[git]
bin_path = "{{ git }}"
bin_path = "{{ git }}"
# catfile_cache_size = 100
[[storage]]
[[storage]]
name = "default"
name = "default"
...
@@ -30,12 +44,20 @@ path = "{{ gitlab.repositories }}"
...
@@ -30,12 +44,20 @@ path = "{{ gitlab.repositories }}"
# path = "/mnt/other_storage/repositories"
# path = "/mnt/other_storage/repositories"
#
#
# # You can optionally configure Gitaly to output JSON-formatted log messages to stdout
# You can optionally configure Gitaly to output JSON-formatted log messages to stdout
# [logging]
[logging]
# The directory where Gitaly stores extra log files
dir = "{{ gitaly.log }}"
# format = "json"
# format = "json"
# # Additionally exceptions can be reported to Sentry
# Optional: Set log level to only log entries with that severity or above
# sentry_dsn = "https://<key>:<secret>@sentry.io/<project>
# One of, in order: debug, info, warn, errror, fatal, panic
# Defaults to "info"
level = "info"
# # Additionally exceptions from the Go server can be reported to Sentry
# sentry_dsn = "https://<key>:<secret>@sentry.io/<project>"
# # Exceptions from gitaly-ruby can also be reported to Sentry
# ruby_sentry_dsn = "https://<key>:<secret>@sentry.io/<project>"
# # You can optionally configure Gitaly to record histogram latencies on GRPC method calls
# # You can optionally configure Gitaly to record histogram latencies on GRPC method calls
# [prometheus]
# [prometheus]
...
@@ -45,8 +67,39 @@ path = "{{ gitlab.repositories }}"
...
@@ -45,8 +67,39 @@ path = "{{ gitlab.repositories }}"
# The directory where gitaly-ruby is installed
# The directory where gitaly-ruby is installed
dir = "{{ gitaly.location }}/ruby"
dir = "{{ gitaly.location }}/ruby"
# # Gitaly-ruby resident set size (RSS) that triggers a memory restart (bytes)
# max_rss = 200000000
#
# # Grace period before a gitaly-ruby process is forcibly terminated after exceeding max_rss (seconds)
# graceful_restart_timeout = "10m"
#
# # Time that gitaly-ruby memory must remain high before a restart (seconds)
# restart_delay = "5m"
#
# # Number of gitaly-ruby worker processes
# num_workers = 2
#
# # Search path for system gitconfig file (e.g. /etc, /opt/gitlab/embedded/etc)
# # NOTE: This only affects RPCs that use Rugged.
# rugged_git_config_search_path = "/etc"
[gitlab-shell]
[gitlab-shell]
# The directory where gitlab-shell is installed
# The directory where gitlab-shell is installed
dir = "{{ gitlab_shell_work.location }}"
dir = "{{ gitlab_shell_work.location }}"
secret_file = "{{ gitlab_shell.secret }}"
custom_hooks_dir = "{{ gitlab_shell_work.location }}/hooks/"
#gitlab_url = "http://localhost:8080"
[gitlab-shell.http-settings]
# read_timeout = 300
# user = someone
# password = somepass
# ca_file = /etc/ssl/cert.pem
# ca_path = /etc/pki/tls/certs
self_signed_cert = false
# # You can adjust the concurrency of each RPC endpoint
# [[concurrency]]
# rpc = "/gitaly.RepositoryService/GarbageCollect"
# max_per_repo = 1
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