From fa759bdc030a929465db443850d78de181b760cc Mon Sep 17 00:00:00 2001 From: Dan Bohea Date: Thu, 6 Jun 2019 13:40:30 +0100 Subject: [PATCH 01/14] Fixes deprecation warnings about evaluating bare variables --- tasks/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index f248279..4dffe21 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -25,7 +25,7 @@ meta: flush_handlers - include_tasks: docker-compose.yml - when: docker_install_compose + when: docker_install_compose | bool - include_tasks: docker-users.yml - when: docker_users + when: docker_users | bool From c70104b485a53fc4f17a1ec89230cef00abf8e7d Mon Sep 17 00:00:00 2001 From: Simon Lammer Date: Fri, 23 Aug 2019 12:25:41 +0200 Subject: [PATCH 02/14] Bump default docker_compose_version to 1.24.1 --- defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/defaults/main.yml b/defaults/main.yml index 2bcb620..3a9cc47 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -11,7 +11,7 @@ docker_restart_handler_state: restarted # Docker Compose options. docker_install_compose: true -docker_compose_version: "1.22.0" +docker_compose_version: "1.24.1" docker_compose_path: /usr/local/bin/docker-compose # Used only for Debian/Ubuntu. Switch 'stable' to 'edge' if needed. From f17b3995219e642c97b88db9a2ad993f27ccc5eb Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Fri, 23 Aug 2019 12:36:34 -0500 Subject: [PATCH 03/14] PR #146: Check list length instead of casting to bool. --- tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/main.yml b/tasks/main.yml index 4dffe21..8968c77 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -28,4 +28,4 @@ when: docker_install_compose | bool - include_tasks: docker-users.yml - when: docker_users | bool + when: docker_users | length > 0 From 38ebd92df48443c61d777976fdca42cc7af758b3 Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Wed, 11 Dec 2019 08:36:02 -0600 Subject: [PATCH 04/14] Fixes #178: Remove support and tests for Ubuntu 14.04 Trusty. --- .travis.yml | 1 - meta/main.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index a8851b7..c67ceb5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,6 @@ env: - MOLECULE_DISTRO: centos7 - MOLECULE_DISTRO: ubuntu1804 - MOLECULE_DISTRO: ubuntu1604 - - MOLECULE_DISTRO: ubuntu1404 - MOLECULE_DISTRO: debian9 - MOLECULE_DISTRO: fedora27 diff --git a/meta/main.yml b/meta/main.yml index 0dfa4cd..b08fb6f 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -21,7 +21,6 @@ galaxy_info: - stretch - name: Ubuntu versions: - - trusty - xenial - bionic galaxy_tags: From 3f884a6edd9c6c398519fb511a5f5f4ec27b00a9 Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Wed, 11 Dec 2019 08:38:14 -0600 Subject: [PATCH 05/14] Issue #171: Test for CentOS 8. --- .travis.yml | 1 + meta/main.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c67ceb5..2ba8fe7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,7 @@ env: global: - ROLE_NAME: docker matrix: + - MOLECULE_DISTRO: centos8 - MOLECULE_DISTRO: centos7 - MOLECULE_DISTRO: ubuntu1804 - MOLECULE_DISTRO: ubuntu1604 diff --git a/meta/main.yml b/meta/main.yml index b08fb6f..84c78b0 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -10,8 +10,8 @@ galaxy_info: platforms: - name: EL versions: - - 6 - 7 + - 8 - name: Fedora versions: - all From 368226babd32d03daa6f91c74859c72a494b1869 Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Wed, 11 Dec 2019 08:47:58 -0600 Subject: [PATCH 06/14] Attempt to manually install containerd on CentOS 8 for now. --- tasks/setup-RedHat.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tasks/setup-RedHat.yml b/tasks/setup-RedHat.yml index 0cd1a50..df15519 100644 --- a/tasks/setup-RedHat.yml +++ b/tasks/setup-RedHat.yml @@ -33,3 +33,9 @@ section: 'docker-{{ docker_edition }}-test' option: enabled value: '{{ docker_yum_repo_enable_test }}' + +- name: Install containerd separately (CentOS 8). + package: + name: https://download.docker.com/linux/centos/7/x86_64/stable/Packages/containerd.io-1.2.6-3.3.el7.x86_64.rpm + state: present + when: ansible_distribution_major_version | int == 8 From 3cba7a9e6fad87ba8bcbd0d718ec6a7c14a5d0da Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Wed, 11 Dec 2019 09:27:09 -0600 Subject: [PATCH 07/14] Fix int to string implicit conversion issue. --- README.md | 4 ++-- defaults/main.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 9a49840..9179908 100644 --- a/README.md +++ b/README.md @@ -41,8 +41,8 @@ Docker Compose installation options. (Used only for Debian/Ubuntu.) You can switch the channel to `edge` if you want to use the Edge release. docker_yum_repo_url: https://download.docker.com/linux/centos/docker-{{ docker_edition }}.repo - docker_yum_repo_enable_edge: 0 - docker_yum_repo_enable_test: 0 + docker_yum_repo_enable_edge: '0' + docker_yum_repo_enable_test: '0' (Used only for RedHat/CentOS.) You can enable the Edge or Test repo by setting the respective vars to `1`. diff --git a/defaults/main.yml b/defaults/main.yml index 3a9cc47..5f670c6 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -22,8 +22,8 @@ docker_apt_ignore_key_error: true # Used only for RedHat/CentOS/Fedora. docker_yum_repo_url: https://download.docker.com/linux/{{ (ansible_distribution == "Fedora") | ternary("fedora","centos") }}/docker-{{ docker_edition }}.repo -docker_yum_repo_enable_edge: 0 -docker_yum_repo_enable_test: 0 +docker_yum_repo_enable_edge: '0' +docker_yum_repo_enable_test: '0' # A list of users who will be added to the docker group. docker_users: [] From cf1e7a73e74f6dee82ff7742f1e4597c60a3c2ec Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Wed, 11 Dec 2019 09:29:43 -0600 Subject: [PATCH 08/14] Issue #150: Add CI test for Debian 10, update Fedora 27 to 30. --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2ba8fe7..c08267e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,8 +10,9 @@ env: - MOLECULE_DISTRO: centos7 - MOLECULE_DISTRO: ubuntu1804 - MOLECULE_DISTRO: ubuntu1604 + - MOLECULE_DISTRO: debian10 - MOLECULE_DISTRO: debian9 - - MOLECULE_DISTRO: fedora27 + - MOLECULE_DISTRO: fedora30 install: # Install test dependencies. From e64effa78843f248cda39fb1b633c042f891f7bd Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Wed, 11 Dec 2019 09:30:23 -0600 Subject: [PATCH 09/14] Issue #150: Add buster to supported Debian versions [ci skip]. --- meta/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/main.yml b/meta/main.yml index 84c78b0..82065cd 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -17,8 +17,8 @@ galaxy_info: - all - name: Debian versions: - - jessie - stretch + - buster - name: Ubuntu versions: - xenial From d33b57d022459d4ecd1bb94a7ab4fcbaad6eb3a5 Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Wed, 11 Dec 2019 09:43:49 -0600 Subject: [PATCH 10/14] Create FUNDING.yml --- .github/FUNDING.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 .github/FUNDING.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 0000000..af7a1e0 --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1,4 @@ +# These are supported funding model platforms + +github: geerlingguy +patreon: geerlingguy From 0be83cb48080719d51aa237d8a527afc07030093 Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Wed, 11 Dec 2019 10:20:09 -0600 Subject: [PATCH 11/14] YAML syntax fix. --- .github/FUNDING.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index af7a1e0..96b4938 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,4 +1,4 @@ # These are supported funding model platforms - +--- github: geerlingguy patreon: geerlingguy From c59e9df5610406f14cd78a2770e35ab74f6f0b38 Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Mon, 16 Dec 2019 10:34:30 -0600 Subject: [PATCH 12/14] Fixes #180: Remove systemd 18.09.0 compatibility shim. --- tasks/docker-1809-shim.yml | 16 ---------------- tasks/main.yml | 4 ---- templates/override.conf.j2 | 3 --- 3 files changed, 23 deletions(-) delete mode 100644 tasks/docker-1809-shim.yml delete mode 100644 templates/override.conf.j2 diff --git a/tasks/docker-1809-shim.yml b/tasks/docker-1809-shim.yml deleted file mode 100644 index 286254b..0000000 --- a/tasks/docker-1809-shim.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- -- name: Ensure containerd service dir exists. - file: - path: /etc/systemd/system/containerd.service.d - state: directory - -- name: Add shim to ensure Docker can start in all environments. - template: - src: override.conf.j2 - dest: /etc/systemd/system/containerd.service.d/override.conf - register: override_template - -- name: Reload systemd daemon if template is changed. - systemd: - daemon_reload: true - when: override_template is changed diff --git a/tasks/main.yml b/tasks/main.yml index 8968c77..56449ef 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -11,10 +11,6 @@ state: "{{ docker_package_state }}" notify: restart docker -# TODO: Remove this shim once 18.09.1 or later is released. -- import_tasks: docker-1809-shim.yml - when: ansible_service_mgr == 'systemd' - - name: Ensure Docker is started and enabled at boot. service: name: docker diff --git a/templates/override.conf.j2 b/templates/override.conf.j2 deleted file mode 100644 index adab53c..0000000 --- a/templates/override.conf.j2 +++ /dev/null @@ -1,3 +0,0 @@ -# {{ ansible_managed }} -[Service] -ExecStartPre= From 000dc4a1fcd991eb7d57ea215a9c4ba4ef9c43f5 Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Mon, 16 Dec 2019 11:31:06 -0600 Subject: [PATCH 13/14] Test on Fedora 31. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c08267e..57d8a28 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ env: - MOLECULE_DISTRO: ubuntu1604 - MOLECULE_DISTRO: debian10 - MOLECULE_DISTRO: debian9 - - MOLECULE_DISTRO: fedora30 + - MOLECULE_DISTRO: fedora31 install: # Install test dependencies. From 736ad7f3518d5de2a91b851c2f7b781756a47f47 Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Mon, 16 Dec 2019 12:06:53 -0600 Subject: [PATCH 14/14] Remove broken Fedora tests. --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 57d8a28..78c59cb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,6 @@ env: - MOLECULE_DISTRO: ubuntu1604 - MOLECULE_DISTRO: debian10 - MOLECULE_DISTRO: debian9 - - MOLECULE_DISTRO: fedora31 install: # Install test dependencies.