Backported upgrade to Docker v19.03.14

atsikham · Feb 4, 2021 · a2c483c · a2c483c
1 parent 007293f
commit a2c483c
Show file tree

Hide file tree

Showing 9 changed files with 129 additions and 126 deletions.
diff --git a/core/src/epicli/cli/licenses.py b/core/src/epicli/cli/licenses.py
diff --git a/core/src/epicli/data/common/ansible/playbooks/roles/docker/defaults/main.yml b/core/src/epicli/data/common/ansible/playbooks/roles/docker/defaults/main.yml
@@ -1,9 +1,9 @@
-# Logging
+---
 docker_logging:
   log_opts:
     max_file_size: 10m # The maximum size of the log before it is rolled. A positive integer plus a modifier representing the unit of measure (k, m, or g)
     max_files: 2       # The maximum number of log files that can be present
 
-docker_version: 
-  Debian: "5:18.09.*"
-  RedHat: "18.09.*"
+docker_version:
+  Debian: "5:19.03.14*" # * is needed to match a version such as '5:19.03.14~3-0~ubuntu-bionic'
+  RedHat: "19.03.14"
diff --git a/core/src/epicli/data/common/ansible/playbooks/roles/docker/tasks/configure-docker.yml b/core/src/epicli/data/common/ansible/playbooks/roles/docker/tasks/configure-docker.yml
@@ -29,4 +29,5 @@
 - name: Verify logging driver # 'json-file' is needed for K8s metadata in Filebeat and log rotation
   assert:
     that: "'json-file' in docker_log_driver.stdout"
-    msg: "Unexpected logging driver, docker_log_driver.stdout: '{{ docker_log_driver.stdout }}'"
+    fail_msg: "Unexpected logging driver, docker_log_driver.stdout: '{{ docker_log_driver.stdout }}'"
+    quiet: true
diff --git a/core/src/epicli/data/common/ansible/playbooks/roles/docker/tasks/main.yml b/core/src/epicli/data/common/ansible/playbooks/roles/docker/tasks/main.yml
@@ -8,6 +8,7 @@
   vars:
     packages:
       RedHat:
+      - containerd.io
       - docker-ce-cli-{{ docker_version.RedHat }}
       - docker-ce-{{ docker_version.RedHat }}
       Debian:

diff --git a/.../ansible/playbooks/roles/repository/files/download-requirements/centos-7/requirements.txt b/.../ansible/playbooks/roles/repository/files/download-requirements/centos-7/requirements.txt
@@ -28,8 +28,8 @@ container-selinux
 cri-tools-1.13.0
 curl
 dejavu-sans-fonts # for grafana
-docker-ce-18.09.9
-docker-ce-cli-18.09.9
+docker-ce-19.03.14
+docker-ce-cli-19.03.14
 ebtables
 elasticsearch-curator-5.8.3
 elasticsearch-oss-6.8.5 # for elasticsearch role

diff --git a/.../ansible/playbooks/roles/repository/files/download-requirements/redhat-7/requirements.txt b/.../ansible/playbooks/roles/repository/files/download-requirements/redhat-7/requirements.txt
@@ -27,8 +27,8 @@ container-selinux
 cri-tools-1.13.0
 curl
 dejavu-sans-fonts # for grafana
-docker-ce-18.09.9
-docker-ce-cli-18.09.9
+docker-ce-19.03.14
+docker-ce-cli-19.03.14
 ebtables
 elasticsearch-curator-5.8.3
 elasticsearch-oss-6.8.5 # for elasticsearch role

diff --git a/...ible/playbooks/roles/repository/files/download-requirements/ubuntu-18.04/requirements.txt b/...ible/playbooks/roles/repository/files/download-requirements/ubuntu-18.04/requirements.txt
@@ -9,8 +9,8 @@ cifs-utils
 containerd.io
 cri-tools 1.13.0
 curl
-docker-ce 5:18.09
-docker-ce-cli 5:18.09
+docker-ce 5:19.03.14
+docker-ce-cli 5:19.03.14
 ebtables
 elasticsearch-curator 5.8.3
 elasticsearch-oss 6.8.5 # for elasticsearch role

diff --git a/docs/home/COMPONENTS.md b/docs/home/COMPONENTS.md
diff --git a/docs/home/HOWTO.md b/docs/home/HOWTO.md
@@ -118,4 +118,4 @@
   - [AWS Security groups](./howto/SECURITY_GROUPS.md#aws-security-groups)
   - [AWS Security groups full yaml file](./howto/SECURITY_GROUPS.md#aws-setting-groups-full-yaml-file)
 
-- [Modules](./howto/modules.md)
+- [Modules](./howto/MODULES.md)