From 3a59e82cec4afdbe3cb4c23af0653c86d8f4ff15 Mon Sep 17 00:00:00 2001
From: gjmzj <gaojianming.zj@139.com>
Date: Thu, 21 Feb 2019 15:13:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=85=BC=E5=AE=B9docker=2018?=
 =?UTF-8?q?.09.x=20=E7=89=88=E6=9C=AC=E5=AE=89=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 roles/docker/tasks/main.yml | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index 272e0d0..f74f1de 100644
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -1,10 +1,16 @@
-## ---------docker daemon配置部分-----------
 - name: 准备docker相关目录
   file: name={{ item }} state=directory
   with_items:
   - "{{ bin_dir }}"
   - /etc/docker
 
+# 18.09.x 版本二进制名字有变化，需要做判断
+- name: 获取docker版本信息
+  shell: "{{ base_dir }}/bin/dockerd --version"
+  register: docker_ver
+  connection: local
+  run_once: true
+
 - name: 下载 docker 二进制文件
   copy: src={{ base_dir }}/bin/{{ item }} dest={{ bin_dir }}/{{ item }} mode=0755
   with_items:
@@ -17,6 +23,21 @@
   - dockerd
   - docker-proxy
   tags: upgrade_docker, download_docker
+  when: "'version 18.09' not in docker_ver.stdout"
+
+- name: 下载 docker 二进制文件(>= 18.09.x)
+  copy: src={{ base_dir }}/bin/{{ item }} dest={{ bin_dir }}/{{ item }} mode=0755
+  with_items:
+  - containerd
+  - containerd-shim
+  - docker-init
+  - runc
+  - docker
+  - ctr
+  - dockerd
+  - docker-proxy
+  tags: upgrade_docker, download_docker
+  when: "'version 18.09' in docker_ver.stdout"
 
 - name: docker命令自动补全
   copy: src=docker dest=/etc/bash_completion.d/docker mode=0644
@@ -47,3 +68,11 @@
 # 先要安装轻量JSON处理程序‘jq’，已在 prepare 节点安装
 - name: 下载 docker-tag
   copy: src=docker-tag dest={{ bin_dir }}/docker-tag mode=0755
+
+- name: 轮询等待docker服务运行
+  shell: "systemctl status docker.service|grep Active"
+  register: docker_status
+  until: '"running" in docker_status.stdout'
+  retries: 8
+  delay: 2
+  tags: upgrade_docker