Skip to content
Snippets Groups Projects
Commit 6b134103 authored by Andrew Patterson's avatar Andrew Patterson
Browse files

Merge branch 'sh-default-region-aws' into 'master'

Propagate AWS_DEFAULT_REGION to Docker environment

See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7741



Merged-by: default avatarAndrew Patterson <apatterson@gitlab.com>
Approved-by: default avatarIan Baum <ibaum@gitlab.com>
Approved-by: default avatarAndrew Patterson <apatterson@gitlab.com>
Co-authored-by: default avatarStan Hu <stanhu@gmail.com>
parents 01e063be 7454b5b1
No related branches found
No related tags found
1 merge request!145Merge upstream Omnibus GitLab into Omnibus Heptapod
......@@ -2,6 +2,7 @@
unless ENV['AWS_CONTAINER_CREDENTIALS_RELATIVE_URI'].nil?
[gitlab_workhorse['env'], gitlab_pages['env'], registry['env'], gitlab_rails['env']].each do |new_env|
new_env['AWS_CONTAINER_CREDENTIALS_RELATIVE_URI'] = ENV['AWS_CONTAINER_CREDENTIALS_RELATIVE_URI']
new_env['AWS_DEFAULT_REGION'] = ENV['AWS_DEFAULT_REGION']
new_env['AWS_REGION'] = ENV['AWS_REGION']
new_env['ECS_CONTAINER_METADATA_URI_V4'] = ENV['ECS_CONTAINER_METADATA_URI_V4'] unless ENV['ECS_CONTAINER_METADATA_URI_V4'].nil?
new_env['ECS_CONTAINER_METADATA_URI'] = ENV['ECS_CONTAINER_METADATA_URI']
......
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