Skip to content
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

Jump to bottom

Adding NO_PROXY environment variable support. #228

Closed
wants to merge 1 commit into from
Closed

Adding NO_PROXY environment variable support. #228

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
2 changes: 1 addition & 1 deletion metadata.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
license 'Apache 2.0'
description 'Installs/Configures Docker'
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version '0.35.2'
version '0.35.3'

recipe 'docker', 'Installs/Configures Docker'
recipe 'docker::aufs', 'Installs/Loads AUFS Linux module'
Expand Down
3 changes: 3 additions & 0 deletions templates/default/docker.service.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ Environment="DOCKER_RAMDISK=<%= node['docker']['ramdisk'] %>"
<% if node['docker']['http_proxy'] -%>
Environment="HTTP_PROXY=<%= node['docker']['http_proxy'] %>"
<% end -%>
<% if node['docker']['no_proxy'] -%>
Environment="NO_PROXY=<%= node['docker']['no_proxy'] %>"
<% end -%>
<% if node['docker']['tmpdir'] -%>
Environment="TMPDIR=<%= node['docker']['tmpdir'] %>"
<% end -%>
Expand Down
6 changes: 6 additions & 0 deletions templates/default/docker.sysconfig.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,12 @@ DOCKER_RAMDISK=<%= node['docker']['ramdisk'] %>
export HTTP_PROXY=<%= node['docker']['http_proxy'] %>
<% end -%>

# In case you need a proxy to hit a public index, but also need to hit a private
# index not accessible via the proxy, use no_proxy
<% if node['docker']['no_proxy'] -%>
export NO_PROXY=<%= node['docker']['no_proxy'] %>
<% end -%>

# This is also a handy place to tweak where Docker's temporary files go.
<% if node['docker']['tmpdir'] -%>
export TMPDIR="<%= node['docker']['tmpdir'] %>"
Expand Down
3 changes: 3 additions & 0 deletions templates/default/sv-docker-run.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ export DOCKER_RAMDISK=<%= node['docker']['ramdisk'] %>
<% if node['docker']['http_proxy'] -%>
export HTTP_PROXY=<%= node['docker']['http_proxy'] %>
<% end -%>
<% if node['docker']['no_proxy'] -%>
export NO_PROXY=<%= node['docker']['no_proxy'] %>
<% end -%>
<% if node['docker']['tmpdir'] -%>
export TMPDIR=<%= node['docker']['tmpdir'] %>
<% end -%>
Expand Down