Fixed docker_http(s)_proxy behavior

Closes #189 * right handling "empty" values of docker_http(s)_proxy * remove http(s)_proxy environment vars if these vars exists after previous installation or manual changes * minor updates in Vagrantfile
angstwad · Oct 17, 2017 · 92062e2 · 92062e2
1 parent de8e8c8
commit 92062e2
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 16 deletions.
diff --git a/Vagrantfile b/Vagrantfile
@@ -60,8 +60,14 @@ Vagrant.configure("2") do |config|
         ansible.playbook = "tests/vagrant.yml"
         ansible.verbose = "vv"
         ansible.host_vars = {
-          "ubuntu-1604-python3" => {"ansible_python_interpreter" => "/usr/bin/python3"}
+          "ubuntu-1604-python3" => {
+            "ansible_python_interpreter" => "/usr/bin/python3",
+            "ansible_ssh_user" => "ubuntu"
+          }
         }
+        ansible.raw_arguments  = [
+          "--diff",
+        ]
       end
     end
   end

diff --git a/defaults/main.yml b/defaults/main.yml
@@ -37,7 +37,7 @@ apt_repository: "deb [arch=amd64] https://download.docker.com/linux/{{ ansible_l
 #  log-opts:
 #      max-file: "3"
 #      max-size: "10m"
-daemon_json: ""
+daemon_json:
 
 # List of users to be added to 'docker' system group (disabled by default)
 # SECURITY WARNING: 

diff --git a/tasks/main.yml b/tasks/main.yml
@@ -126,17 +126,27 @@
   when: ( ansible_lsb.id|lower == "ubuntu" and ansible_distribution_version|version_compare('15.04', '>=') or ansible_lsb.id|lower == "debian" )
   tags: always
 
+- name: Set docker_http_proxy_defined flag
+  set_fact:
+    docker_http_proxy_defined: "{{ docker_http_proxy is defined and docker_http_proxy is not none and docker_http_proxy != '' }}"
+  tags: proxy
+
+- name: Set docker_https_proxy_defined flag
+  set_fact:
+    docker_https_proxy_defined: "{{ docker_https_proxy is defined and docker_https_proxy is not none and docker_https_proxy != '' }}"
+  tags: proxy
+
 # https://github.com/moby/moby/issues/25471#issuecomment-263101090
 - name: Creates override directory (systemd)
   file:
     path: /etc/systemd/system/docker.service.d
-    state: directory
+    state: "{{ daemon_json is not none or docker_http_proxy_defined or docker_https_proxy_defined | ternary('directory', 'absent') }}"
     owner: root
     group: root
     mode: 0755
   when:
     - is_systemd
-    - daemon_json != '' or (docker_http_proxy|default('')) != '' or (docker_https_proxy|default('')) != ''
+  tags: proxy
 
 - name: Set docker daemon override (systemd)
   copy:
@@ -151,7 +161,7 @@
   notify:
     - Reload systemd
     - Restart docker
-  when: daemon_json != "" and is_systemd
+  when: daemon_json is not none and is_systemd
 
 - name: Set /etc/docker/daemon.json
   copy:
@@ -162,7 +172,7 @@
     mode: 0644
   notify:
     - Restart docker
-  when: daemon_json != ""
+  when: daemon_json is not none
 
 - name: Fix DNS in docker.io
   lineinfile:
@@ -265,25 +275,23 @@
 - name: Set docker HTTP_PROXY if docker_http_proxy defined
   lineinfile:
     dest: /etc/default/docker
-    regexp: "^export HTTP_PROXY="
-    line: "export HTTP_PROXY=\"{{docker_http_proxy}}\""
-    state: present
+    regexp: "^export http_proxy="
+    line: "export http_proxy=\"{{docker_http_proxy}}\""
+    state: "{{ docker_http_proxy_defined | ternary('present', 'absent') }}"
   when:
     - not is_systemd
-    - (docker_http_proxy|default('')) != ''
   notify:
     - Restart docker
   tags: proxy
 
 - name: Set docker HTTPS_PROXY if docker_https_proxy defined
   lineinfile:
     dest: /etc/default/docker
-    regexp: "^export HTTPS_PROXY="
-    line: "export HTTPS_PROXY=\"{{docker_https_proxy}}\""
-    state: present
+    regexp: "^export https_proxy="
+    line: "export https_proxy=\"{{docker_https_proxy}}\""
+    state: "{{ docker_https_proxy_defined | ternary('present', 'absent') }}"
   when:
     - not is_systemd
-    - (docker_https_proxy|default('')) != ''
   notify:
     - Restart docker
   tags: proxy
@@ -292,7 +300,7 @@
   copy:
     content: |
       [Service]
-      Environment="HTTP_PROXY={{ docker_http_proxy }} HTTPS_PROXY={{ docker_https_proxy | default('') }} NO_PROXY={{ docker_no_proxy | default('') }}"
+      Environment="{% if docker_http_proxy_defined %}http_proxy={{ docker_http_proxy }}{% endif %} {% if docker_https_proxy_defined %}https_proxy={{ docker_https_proxy }}{% endif %} no_proxy={{ docker_no_proxy | default('') }}"
     dest: /etc/systemd/system/docker.service.d/proxy.conf
     owner: root
     group: root
@@ -302,7 +310,19 @@
     - Restart docker
   when:
     - is_systemd
-    - (docker_http_proxy|default('')) != '' or (docker_https_proxy|default('')) != ''
+    - docker_http_proxy_defined or docker_https_proxy_defined
+  tags: proxy
+
+- name: Remove docker HTTP(S)_PROXY if docker_http(s)_proxy undefined (systemd)
+  file:
+    path: /etc/systemd/system/docker.service.d/proxy.conf
+    state: absent
+  notify:
+    - Reload systemd
+    - Restart docker
+  when:
+    - is_systemd
+    - not docker_http_proxy_defined and not docker_https_proxy_defined
   tags: proxy
 
 - name: Start docker

diff --git a/tests/vagrant.yml b/tests/vagrant.yml
@@ -31,3 +31,9 @@
         name: foobar
         state: absent
       when: container_creation.changed
+
+    - name: Remove the dummy image
+      docker_image:
+        name: busybox
+        state: absent
+      when: container_creation.changed