From 5a4045d5c183ac73f96c94a82413e09aa43ae577 Mon Sep 17 00:00:00 2001 From: Felix Herzog Date: Tue, 19 Mar 2019 19:33:20 +0100 Subject: [PATCH 01/28] added option to set docker gpg key --- README.md | 2 ++ defaults/main.yml | 2 ++ tasks/setup-Debian.yml | 4 ++-- tasks/setup-RedHat.yml | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 9a49840..390e3ce 100644 --- a/README.md +++ b/README.md @@ -37,12 +37,14 @@ Docker Compose installation options. docker_apt_arch: amd64 docker_apt_repository: "deb [arch={{ docker_apt_arch }}] https://download.docker.com/linux/{{ ansible_distribution|lower }} {{ ansible_distribution_release }} {{ docker_apt_release_channel }}" docker_apt_ignore_key_error: True + docker_apt_gpg_key: https://download.docker.com/linux/ubuntu/gpg (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_gpg_key: https://download.docker.com/linux/centos/gpg (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 2bcb620..6974534 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -19,11 +19,13 @@ docker_apt_release_channel: stable docker_apt_arch: amd64 docker_apt_repository: "deb [arch={{ docker_apt_arch }}] https://download.docker.com/linux/{{ ansible_distribution|lower }} {{ ansible_distribution_release }} {{ docker_apt_release_channel }}" docker_apt_ignore_key_error: true +docker_apt_gpg_key: https://download.docker.com/linux/ubuntu/gpg # 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_gpg_key: https://download.docker.com/linux/centos/gpg # A list of users who will be added to the docker group. docker_users: [] diff --git a/tasks/setup-Debian.yml b/tasks/setup-Debian.yml index 23a49ae..71c4c35 100644 --- a/tasks/setup-Debian.yml +++ b/tasks/setup-Debian.yml @@ -15,7 +15,7 @@ - name: Add Docker apt key. apt_key: - url: https://download.docker.com/linux/ubuntu/gpg + url: "{{ docker_apt_gpg_key }}" id: 9DC858229FC7DD38854AE2D88D81803C0EBFCD88 state: present register: add_repository_key @@ -26,7 +26,7 @@ when: add_repository_key is failed - name: Add Docker apt key (alternative for older systems without SNI). - shell: "curl -sSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -" + shell: "curl -sSL {{ docker_apt_gpg_key }} | sudo apt-key add -" args: warn: false when: add_repository_key is failed diff --git a/tasks/setup-RedHat.yml b/tasks/setup-RedHat.yml index 0cd1a50..bbeeda4 100644 --- a/tasks/setup-RedHat.yml +++ b/tasks/setup-RedHat.yml @@ -9,7 +9,7 @@ - name: Add Docker GPG key. rpm_key: - key: https://download.docker.com/linux/centos/gpg + key: "{{ docker_yum_gpg_key }}" state: present - name: Add Docker repository. From fa759bdc030a929465db443850d78de181b760cc Mon Sep 17 00:00:00 2001 From: Dan Bohea Date: Thu, 6 Jun 2019 13:40:30 +0100 Subject: [PATCH 02/28] 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 03/28] 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 04/28] 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 05/28] 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 06/28] 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 07/28] 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 08/28] 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 09/28] 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 10/28] 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 11/28] 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 12/28] 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 13/28] 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 14/28] 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 15/28] 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. From 1af676c5bafdfe17e313ec555696a98e4f352dc1 Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Thu, 20 Feb 2020 14:20:44 -0600 Subject: [PATCH 16/28] Update molecule configuration to work with 3.0. --- .travis.yml | 2 +- molecule/default/molecule.yml | 13 +++---------- molecule/default/playbook.yml | 12 ------------ molecule/default/yaml-lint.yml | 6 ------ 4 files changed, 4 insertions(+), 29 deletions(-) delete mode 100644 molecule/default/playbook.yml delete mode 100644 molecule/default/yaml-lint.yml diff --git a/.travis.yml b/.travis.yml index 78c59cb..a0001c3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ env: install: # Install test dependencies. - - pip install molecule docker + - pip install molecule yamllint ansible-lint docker before_script: # Use actual Ansible Galaxy role name for the project directory. diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 2ca6fea..f2e9611 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -4,9 +4,8 @@ dependency: driver: name: docker lint: - name: yamllint - options: - config-file: molecule/default/yaml-lint.yml + yamllint . + ansible-lint platforms: - name: instance image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest" @@ -17,13 +16,7 @@ platforms: pre_build_image: true provisioner: name: ansible - lint: - name: ansible-lint playbooks: - converge: ${MOLECULE_PLAYBOOK:-playbook.yml} + converge: ${MOLECULE_PLAYBOOK:-converge.yml} scenario: name: default -verifier: - name: testinfra - lint: - name: flake8 diff --git a/molecule/default/playbook.yml b/molecule/default/playbook.yml deleted file mode 100644 index dad331d..0000000 --- a/molecule/default/playbook.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- -- name: Converge - hosts: all - become: true - - pre_tasks: - - name: Update apt cache. - apt: update_cache=yes cache_valid_time=600 - when: ansible_os_family == 'Debian' - - roles: - - role: geerlingguy.docker diff --git a/molecule/default/yaml-lint.yml b/molecule/default/yaml-lint.yml deleted file mode 100644 index 7aeec5a..0000000 --- a/molecule/default/yaml-lint.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -extends: default -rules: - line-length: - max: 200 - level: warning From 31752ec3253d86aa8b591528163d024f4f6c3e34 Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Thu, 20 Feb 2020 14:26:43 -0600 Subject: [PATCH 17/28] Update molecule configuration to work with 3.0. --- .yamllint | 6 ++++++ molecule/default/converge.yml | 12 ++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 .yamllint create mode 100644 molecule/default/converge.yml diff --git a/.yamllint b/.yamllint new file mode 100644 index 0000000..7aeec5a --- /dev/null +++ b/.yamllint @@ -0,0 +1,6 @@ +--- +extends: default +rules: + line-length: + max: 200 + level: warning diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml new file mode 100644 index 0000000..dad331d --- /dev/null +++ b/molecule/default/converge.yml @@ -0,0 +1,12 @@ +--- +- name: Converge + hosts: all + become: true + + pre_tasks: + - name: Update apt cache. + apt: update_cache=yes cache_valid_time=600 + when: ansible_os_family == 'Debian' + + roles: + - role: geerlingguy.docker From ef27c01dd3c840d0858b538d7f7695a274d312a4 Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Thu, 20 Feb 2020 15:52:40 -0600 Subject: [PATCH 18/28] Update molecule configuration to work with 3.0. --- molecule/default/molecule.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index f2e9611..38eb962 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -3,7 +3,7 @@ dependency: name: galaxy driver: name: docker -lint: +lint: | yamllint . ansible-lint platforms: @@ -18,5 +18,3 @@ provisioner: name: ansible playbooks: converge: ${MOLECULE_PLAYBOOK:-converge.yml} -scenario: - name: default From a19ed5612847c94c3fe70905b379bbf970f3d6e4 Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Thu, 20 Feb 2020 16:50:26 -0600 Subject: [PATCH 19/28] Fix issue relating to gnupg2 missing. --- tasks/setup-Debian.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/tasks/setup-Debian.yml b/tasks/setup-Debian.yml index eaaa96f..97a0a27 100644 --- a/tasks/setup-Debian.yml +++ b/tasks/setup-Debian.yml @@ -11,6 +11,7 @@ name: - apt-transport-https - ca-certificates + - gnupg2 state: present - name: Add Docker apt key. From fce29b0842b2ee31b95d752ed3eea9657b8de15a Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Mon, 24 Feb 2020 09:42:52 -0600 Subject: [PATCH 20/28] Make sure molecule lint script has set -e option. --- molecule/default/molecule.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 38eb962..2da47dd 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -4,6 +4,7 @@ dependency: driver: name: docker lint: | + set -e yamllint . ansible-lint platforms: From b6530bfb7de4ad254ca66d2779fcd611fb6428ca Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Fri, 28 Feb 2020 09:30:05 -0600 Subject: [PATCH 21/28] Fixes #188: Remove pipefail option from shell command on Debian. --- tasks/setup-Debian.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tasks/setup-Debian.yml b/tasks/setup-Debian.yml index 97a0a27..21dc204 100644 --- a/tasks/setup-Debian.yml +++ b/tasks/setup-Debian.yml @@ -27,8 +27,7 @@ when: add_repository_key is failed - name: Add Docker apt key (alternative for older systems without SNI). - shell: | - set -o pipefail + shell: > curl -sSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - args: warn: false From c8fff5967498178d29262737e32afc3aa000e228 Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Fri, 28 Feb 2020 09:34:17 -0600 Subject: [PATCH 22/28] Issue #188: Ignore lint rules that cause painful sorrow. --- .ansible-lint | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .ansible-lint diff --git a/.ansible-lint b/.ansible-lint new file mode 100644 index 0000000..4778564 --- /dev/null +++ b/.ansible-lint @@ -0,0 +1,2 @@ +skip_list: + - '306' From f934d494735feb6bd0528782ab8b7875405980da Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Thu, 5 Mar 2020 10:42:11 -0600 Subject: [PATCH 23/28] Add probot/stale configuration to repository for stale issues. --- .github/stale.yml | 56 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 .github/stale.yml diff --git a/.github/stale.yml b/.github/stale.yml new file mode 100644 index 0000000..c7ff127 --- /dev/null +++ b/.github/stale.yml @@ -0,0 +1,56 @@ +# Configuration for probot-stale - https://github.com/probot/stale + +# Number of days of inactivity before an Issue or Pull Request becomes stale +daysUntilStale: 90 + +# Number of days of inactivity before an Issue or Pull Request with the stale label is closed. +# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale. +daysUntilClose: 30 + +# Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled) +onlyLabels: [] + +# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable +exemptLabels: + - pinned + - security + - planned + +# Set to true to ignore issues in a project (defaults to false) +exemptProjects: false + +# Set to true to ignore issues in a milestone (defaults to false) +exemptMilestones: false + +# Set to true to ignore issues with an assignee (defaults to false) +exemptAssignees: false + +# Label to use when marking as stale +staleLabel: stale + +# Limit the number of actions per hour, from 1-30. Default is 30 +limitPerRun: 30 + +pulls: + markComment: |- + This pull request has been marked 'stale' due to lack of recent activity. If there is no further activity, the PR will be closed in another 30 days. Thank you for your contribution! + + Please read [this blog post](https://www.jeffgeerling.com/blog/2020/enabling-stale-issue-bot-on-my-github-repositories) to see the reasons why I mark pull requests as stale. + + unmarkComment: >- + This pull request is no longer marked for closure. + + closeComment: >- + This pull request has been closed due to inactivity. If you feel this is in error, please reopen the pull request or file a new PR with the relevant details. + +issues: + markComment: |- + This issue has been marked 'stale' due to lack of recent activity. If there is no further activity, the issue will be closed in another 30 days. Thank you for your contribution! + + Please read [this blog post](https://www.jeffgeerling.com/blog/2020/enabling-stale-issue-bot-on-my-github-repositories) to see the reasons why I mark issues as stale. + + unmarkComment: >- + This issue is no longer marked for closure. + + closeComment: >- + This issue has been closed due to inactivity. If you feel this is in error, please reopen the issue or file a new issue with the relevant details. From 6f4fa78c90d46155737e023ea1bddb00c5d72697 Mon Sep 17 00:00:00 2001 From: Felix Herzog Date: Fri, 6 Mar 2020 12:04:27 +0100 Subject: [PATCH 24/28] add changes from #170 in origin --- README.md | 4 ++-- defaults/main.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index bbd8c12..d595a83 100644 --- a/README.md +++ b/README.md @@ -35,9 +35,9 @@ Docker Compose installation options. docker_apt_release_channel: stable docker_apt_arch: amd64 - docker_apt_repository: "deb [arch={{ docker_apt_arch }}] https://download.docker.com/linux/{{ ansible_distribution|lower }} {{ ansible_distribution_release }} {{ docker_apt_release_channel }}" + docker_apt_repository: "deb [arch={{ docker_apt_arch }}] https://download.docker.com/linux/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} {{ docker_apt_release_channel }}" docker_apt_ignore_key_error: True - docker_apt_gpg_key: https://download.docker.com/linux/ubuntu/gpg + docker_apt_gpg_key: https://download.docker.com/linux/{{ ansible_disztribution | lower }}/gpg (Used only for Debian/Ubuntu.) You can switch the channel to `edge` if you want to use the Edge release. diff --git a/defaults/main.yml b/defaults/main.yml index 7fba2ba..166445d 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -17,9 +17,9 @@ docker_compose_path: /usr/local/bin/docker-compose # Used only for Debian/Ubuntu. Switch 'stable' to 'edge' if needed. docker_apt_release_channel: stable docker_apt_arch: amd64 -docker_apt_repository: "deb [arch={{ docker_apt_arch }}] https://download.docker.com/linux/{{ ansible_distribution|lower }} {{ ansible_distribution_release }} {{ docker_apt_release_channel }}" +docker_apt_repository: "deb [arch={{ docker_apt_arch }}] https://download.docker.com/linux/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} {{ docker_apt_release_channel }}" docker_apt_ignore_key_error: true -docker_apt_gpg_key: https://download.docker.com/linux/ubuntu/gpg +docker_apt_gpg_key: https://download.docker.com/linux/{{ ansible_distribution | lower }}/gpg # 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 From 96928c8fe197800d633dcc9efd115032b3cf5d02 Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Fri, 6 Mar 2020 09:47:14 -0600 Subject: [PATCH 25/28] Bump docker-compose version to latest. --- README.md | 2 +- defaults/main.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9179908..b556ba9 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ You can control whether the package is installed, uninstalled, or at the latest Variables to control the state of the `docker` service, and whether it should start on boot. If you're installing Docker inside a Docker container without systemd or sysvinit, you should set these to `stopped` and set the enabled variable to `no`. docker_install_compose: true - docker_compose_version: "1.22.0" + docker_compose_version: "1.25.4" docker_compose_path: /usr/local/bin/docker-compose Docker Compose installation options. diff --git a/defaults/main.yml b/defaults/main.yml index 5f670c6..c71fbed 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.24.1" +docker_compose_version: "1.25.4" docker_compose_path: /usr/local/bin/docker-compose # Used only for Debian/Ubuntu. Switch 'stable' to 'edge' if needed. From 5e2587e4e9c1bbc72876c0e9eb2bc1c42e4d56f1 Mon Sep 17 00:00:00 2001 From: Felix Herzog Date: Fri, 6 Mar 2020 16:48:57 +0100 Subject: [PATCH 26/28] fix typo in `ansible_distribution` --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d595a83..4d22011 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ Docker Compose installation options. docker_apt_arch: amd64 docker_apt_repository: "deb [arch={{ docker_apt_arch }}] https://download.docker.com/linux/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} {{ docker_apt_release_channel }}" docker_apt_ignore_key_error: True - docker_apt_gpg_key: https://download.docker.com/linux/{{ ansible_disztribution | lower }}/gpg + docker_apt_gpg_key: https://download.docker.com/linux/{{ ansible_distribution | lower }}/gpg (Used only for Debian/Ubuntu.) You can switch the channel to `edge` if you want to use the Edge release. From ec84a4cde652f117bf21373ed975ad207ba2d673 Mon Sep 17 00:00:00 2001 From: Felix Herzog Date: Fri, 6 Mar 2020 16:49:53 +0100 Subject: [PATCH 27/28] add description of usage for new variables `docker_*_gpg_key` as requested in #131 --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 4d22011..68bac07 100644 --- a/README.md +++ b/README.md @@ -41,6 +41,9 @@ Docker Compose installation options. (Used only for Debian/Ubuntu.) You can switch the channel to `edge` if you want to use the Edge release. +You can change `docker_apt_gpg_key` to a different url if you are behind a firewall or provide a trustworthy mirror. +Usually in combination with changing `docker_apt_repository` as well. + 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' @@ -48,6 +51,9 @@ Docker Compose installation options. (Used only for RedHat/CentOS.) You can enable the Edge or Test repo by setting the respective vars to `1`. +You can change `docker_yum_gpg_key` to a different url if you are behind a firewall or provide a trustworthy mirror. +Usually in combination with changing `docker_yum_repository` as well. + docker_users: - user1 - user2 From cd50bf980bf1aa752699613490b035419c59a197 Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Fri, 6 Mar 2020 10:00:50 -0600 Subject: [PATCH 28/28] PR #131 follow-up: spacing issue in YAML. --- tasks/setup-Debian.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/setup-Debian.yml b/tasks/setup-Debian.yml index b106944..d701135 100644 --- a/tasks/setup-Debian.yml +++ b/tasks/setup-Debian.yml @@ -28,7 +28,7 @@ - name: Add Docker apt key (alternative for older systems without SNI). shell: > - curl -sSL {{ docker_apt_gpg_key }} | sudo apt-key add - + curl -sSL {{ docker_apt_gpg_key }} | sudo apt-key add - args: warn: false when: add_repository_key is failed