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

add proxy env variables within the container #176

Merged
merged 3 commits into from Nov 10, 2015
Merged

add proxy env variables within the container #176

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7cdf80f
add proxy env variables within the container
Nov 9, 2015
fb3f711
single source conditionals
Nov 10, 2015
d1d3975
fix typo
Nov 10, 2015
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
19 changes: 18 additions & 1 deletion lib/kitchen/driver/docker.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,23 @@ def generate_keys

def build_dockerfile
from = "FROM #{config[:image]}"

env_variables = ''
if config[:http_proxy]
env_variables << "ENV http_proxy #{config[:http_proxy]}\n"
env_variables << "ENV HTTP_PROXY #{config[:http_proxy]}\n"
end

if config[:https_proxy]
env_variables << "ENV https_proxy #{config[:https_proxy]}\n"
env_variables << "ENV HTTPS_PROXY #{config[:https_proxy]}\n"
end

if config[:no_proxy]
env_variables << "ENV no_proxy #{config[:no_proxy]}\n"
env_variables << "ENV NO_PROXY #{config[:no_proxy]}\n"
end

platform = case config[:platform]
when 'debian', 'ubuntu'
disable_upstart = <<-eos
Expand Down Expand Up @@ -226,7 +243,7 @@ def build_dockerfile
end
ssh_key = "RUN echo '#{public_key}' >> #{homedir}/.ssh/authorized_keys"
# Empty string to ensure the file ends with a newline.
[from, platform, base, custom, ssh_key, ''].join("\n")
[from, env_variables, platform, base, custom, ssh_key, ''].join("\n")
end

def dockerfile
Expand Down