Skip to content

Commit

Permalink
Added support for http(s) proxy for the daemon.
Browse files Browse the repository at this point in the history
  • Loading branch information
mprasil committed Feb 22, 2016
1 parent 8f3e62f commit 1badb6a
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 0 deletions.
2 changes: 2 additions & 0 deletions defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
---
# Options passed to the docker daemon at start
docker_opts: ""
docker_http_proxy: ""
docker_https_proxy: ""
6 changes: 6 additions & 0 deletions templates/sysconfig.j2
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,9 @@ DOCKER_OPTS="{{ docker_opts }}"
{% elif ansible_distribution_major_version == "6" %}
other_args="{{ docker_opts }}"
{% endif %}
{% if docker_http_proxy %}
HTTP_PROXY="{{ docker_http_proxy }}"
{% endif %}
{% if docker_https_proxy %}
HTTPS_PROXY="{{ docker_https_proxy }}"
{% endif %}

0 comments on commit 1badb6a

Please sign in to comment.