diff --git a/README.md b/README.md index d9d5976..c899261 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,11 @@ install_docker_edition: ce # by default, set to ce ``` This variable sets the edition of docker to install. It can be either `ce` (community edition) or `ee` (enterprise edition). +```yaml +install_docker_auto_update: false # by default, set to false +``` +This variable allows you to choose to automatically update docker if a newer version is available whenever the role is replayed. Updating docker is usually pretty safe if done on a regular basis. + ```yaml install_docker_start_service: true ``` diff --git a/defaults/install_docker.yml.sample b/defaults/install_docker.yml.sample index b6bed11..4fe7522 100644 --- a/defaults/install_docker.yml.sample +++ b/defaults/install_docker.yml.sample @@ -1,5 +1,6 @@ --- # install_docker_edition: ce # can be ce or ee (community or enterprise) +# install_docker_auto_update: false # install_docker_start_service: true # install_docker_compose: false # install_docker_compose_version: latest diff --git a/defaults/main.yml b/defaults/main.yml index 076dc75..8112f0d 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,6 +1,7 @@ --- # defaults file for install_docker install_docker_edition: ce # can be ce or ee (community or enterprise) +install_docker_auto_update: false install_docker_start_service: true install_docker_compose: false install_docker_compose_version: latest diff --git a/molecule/with_custom_config/group_vars/all.yml b/molecule/with_custom_config/group_vars/all.yml index 76944b0..9996b9c 100644 --- a/molecule/with_custom_config/group_vars/all.yml +++ b/molecule/with_custom_config/group_vars/all.yml @@ -1,5 +1,6 @@ --- install_docker_edition: ce # can be ce or ee (community or enterprise) +install_docker_auto_update: true install_docker_start_service: true install_docker_compose: true install_docker_compose_version: latest diff --git a/vars/main.yml b/vars/main.yml index f75f792..400d86e 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -12,20 +12,20 @@ install_docker_daemon_dir: /etc/docker install_docker_packages: - name: "docker-{{ install_docker_edition }}" version: latest - state: present + state: "{% if install_docker_auto_update %}latest{% else %}present{% endif %}" - name: "docker-{{ install_docker_edition }}-cli" version: latest - state: present + state: "{% if install_docker_auto_update %}latest{% else %}present{% endif %}" - name: "docker-{{ install_docker_edition }}-rootless-extras" version: latest - state: present + state: "{% if install_docker_auto_update %}latest{% else %}present{% endif %}" - name: "containerd.io" version: latest - state: present + state: "{% if install_docker_auto_update %}latest{% else %}present{% endif %}" install_docker_pip_packages: - name: docker version_constraint: latest - state: present + state: "{% if install_docker_auto_update %}latest{% else %}present{% endif %}" install_docker_repository: - uri: "https://download.docker.com/linux/{{ ansible_distribution|lower }}" gpg_key: "https://download.docker.com/linux/{{ ansible_distribution|lower }}/gpg"