Skip to content
Snippets Groups Projects
Commit fde23b53 authored by Jason Plum's avatar Jason Plum
Browse files

Merge branch 'bump-to-8172' into 'master'

Bump to 8.17.2

See merge request !28
parents 8ae96e19 e2d64023
No related branches found
No related tags found
1 merge request!28Bump to 8.17.2
......@@ -13,7 +13,7 @@ spec:
spec:
containers:
- name: gitlab
image: gitlab/gitlab-ce:8.17.0-ce.0
image: gitlab/gitlab-ce:8.17.2-ce.0
imagePullPolicy: IfNotPresent
command: ["/bin/bash", "-c",
"sed -i \"s/environment ({'GITLAB_ROOT_PASSWORD' => initial_root_password }) if initial_root_password/environment ({'GITLAB_ROOT_PASSWORD' => initial_root_password, 'GITLAB_SHARED_RUNNERS_REGISTRATION_TOKEN' => node['gitlab']['gitlab-rails']['initial_shared_runners_registration_token'] })/g\" /opt/gitlab/embedded/cookbooks/gitlab/recipes/database_migrations.rb && exec /assets/wrapper"]
......@@ -141,7 +141,7 @@ spec:
redis_exporter['flags'] = {
'redis.addr' => "gitlab-redis:6379",
}
- name: GITLAB_POST_RECONFIGURE_SCRIPT
value: |
/opt/gitlab/bin/gitlab-rails runner -e production 'Doorkeeper::Application.where(uid: ENV["MATTERMOST_APP_UID"], secret: ENV["MATTERMOST_APP_SECRET"], redirect_uri: "#{ENV["GITLAB_MATTERMOST_EXTERNAL_SCHEME"]}://#{ENV["GITLAB_MATTERMOST_EXTERNAL_HOSTNAME"]}/signup/gitlab/complete\r\n#{ENV["GITLAB_MATTERMOST_EXTERNAL_SCHEME"]}://#{ENV["GITLAB_MATTERMOST_EXTERNAL_HOSTNAME"]}/login/gitlab/complete", name: "GitLab Mattermost").first_or_create;'
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment