From 4beb35cdbe8500589af85044d1471ae2262bbfb0 Mon Sep 17 00:00:00 2001 From: barryz Date: Wed, 1 Sep 2021 16:54:56 +0800 Subject: [PATCH] add proxy_env for docker installation --- defaults/main.yml | 5 +++++ tasks/docker-compose.yml | 1 + tasks/main.yml | 1 + 3 files changed, 7 insertions(+) diff --git a/defaults/main.yml b/defaults/main.yml index 1b9de37..fba3296 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -36,3 +36,8 @@ docker_users: [] # Docker daemon options as a dict docker_daemon_options: {} + +# proxy env, if defined, env vars https_proxy and http_proxy will be injected. +proxy_env: + http_proxy: 'http://10.0.45.5:8118' + https_proxy: 'http://10.0.45.5:8118' \ No newline at end of file diff --git a/tasks/docker-compose.yml b/tasks/docker-compose.yml index 1dee81d..95a6a82 100644 --- a/tasks/docker-compose.yml +++ b/tasks/docker-compose.yml @@ -18,6 +18,7 @@ url: "{{ docker_compose_url }}" dest: "{{ docker_compose_path }}" mode: 0755 + environment: "{{ proxy_env }}" when: > docker_compose_current_version.stdout is not defined or docker_compose_version not in docker_compose_current_version.stdout diff --git a/tasks/main.yml b/tasks/main.yml index 7db3b93..c8cac41 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -11,6 +11,7 @@ state: "{{ docker_package_state }}" notify: restart docker ignore_errors: "{{ ansible_check_mode }}" + environment: "{{ proxy_env }}" - name: Ensure /etc/docker/ directory exists. file: