Skip to content

joyent/sdc-imgapi#11 no_proxy support; https://cr.joyent.us/#/c/830/ commit should be applied to package.json #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
joyent-automation wants to merge 1 commit into
base: master
Choose a base branch
from
Open

joyent/sdc-imgapi#11 no_proxy support; https://cr.joyent.us/#/c/830/ commit should be applied to package.json #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions lib/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,6 +414,11 @@ function commonHttpClientOpts(clientOpts, req) {
clientOpts.proxy = app.config.httpProxy || false;
}

// noProxy
if (clientOpts.noProxy === undefined) {
clientOpts.noProxy = app.config.noProxy;
}

// headers.request-id
if (req && req.getId()) {
var req_id = (clientOpts.headers
Expand Down
1 change: 1 addition & 0 deletions sapi_manifests/imgapi/template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
},

"httpProxy": "{{{http_proxy}}}",
"noProxy": "{{{no_proxy}}}",
"dockerRegistryInsecure": {{^docker_registry_insecure}}false{{/docker_registry_insecure}}{{#docker_registry_insecure}}{{{docker_registry_insecure}}}{{/docker_registry_insecure}},

"// imgapi-manta-setup": "The following vars used by 'imgapi-*-manta-setup'.",
Expand Down