From 760fc0bf0fa6b18dbdcd61d251320f19507b5c19 Mon Sep 17 00:00:00 2001 From: Oliver Stacey Date: Mon, 24 Oct 2016 15:11:32 -0700 Subject: [PATCH] When installing docker package, pass "--force-confnew", so that config files are replaced even if they have been modified. --- CHANGES.md | 4 ++++ tasks/docker-engine.yml | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 020f96d..abcef8d 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,7 @@ +Version 2.1.2: + - Pass the "--force-confnew" flag to dpkg when installing the Docker package, to make + sure configuration files are replaced even if they have been edited. + Version 2.1.1: - Stop the "docker" service before attempting a package upgrade, to prevent an intermittent upgrade failure. diff --git a/tasks/docker-engine.yml b/tasks/docker-engine.yml index 1a699fa..ceab573 100644 --- a/tasks/docker-engine.yml +++ b/tasks/docker-engine.yml @@ -47,6 +47,7 @@ register: collect_container_configs_result when: "{{ docker_exec_stat_result.stat.exists and docker_attempt_upgrade_fixes }}" + always_run: True # It should be OK to just run the apt install of the new docker package, regardless of the # state of docker. However, there's an issue that sometimes occurs in that case, where the @@ -58,7 +59,10 @@ when: "{{ docker_exec_stat_result.stat.exists and installed_docker_version != docker_version }}" - name: Install Docker Engine - apt: name="docker-engine={{ docker_version }}-0~{{ ansible_distribution_release }}" state=present + apt: + name: "docker-engine={{ docker_version }}-0~{{ ansible_distribution_release }}" + state: present + dpkg-options: "force-confnew" register: docker_engine_install # Some updates will break data volumes. There are two issues: