diff options
| author | Egor Tensin <egor@tensin.name> | 2026-06-09 18:19:02 +0200 |
|---|---|---|
| committer | Egor Tensin <egor@tensin.name> | 2026-06-09 18:40:31 +0200 |
| commit | cd5c4c838cd6af56de89f8903135fa807e1588ba (patch) | |
| tree | 0df9dc0e6202e3ac42894eb142fd7f5fce5b09a2 | |
| parent | v7.0.5 (diff) | |
| download | infra-ansible-cd5c4c838cd6af56de89f8903135fa807e1588ba.tar.gz infra-ansible-cd5c4c838cd6af56de89f8903135fa807e1588ba.zip | |
docker: fix required package lists
| -rw-r--r-- | roles/docker/tasks/main.yml | 6 | ||||
| -rw-r--r-- | roles/docker/vars/Debian.yml | 9 | ||||
| -rw-r--r-- | roles/docker/vars/Ubuntu_noble.yml | 12 |
3 files changed, 14 insertions, 13 deletions
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml index 7c01c2a..3f3ca86 100644 --- a/roles/docker/tasks/main.yml +++ b/roles/docker/tasks/main.yml @@ -2,15 +2,13 @@ ansible.builtin.setup: gather_subset: - distribution - - distribution_major_version - - os_family + - distribution_release - name: Set platform-specific variables ansible.builtin.include_vars: "{{ __docker_vars_file }}" loop: - - "{{ ansible_facts['os_family'] }}.yml" - "{{ ansible_facts['distribution'] }}.yml" - - "{{ ansible_facts['distribution'] }}_{{ ansible_facts['distribution_major_version'] }}.yml" + - "{{ ansible_facts['distribution'] }}_{{ ansible_facts['distribution_release'] }}.yml" vars: __docker_vars_file: "{{ role_path }}/vars/{{ item }}" when: __docker_vars_file is exists diff --git a/roles/docker/vars/Debian.yml b/roles/docker/vars/Debian.yml index 683f48f..67d5be8 100644 --- a/roles/docker/vars/Debian.yml +++ b/roles/docker/vars/Debian.yml @@ -1,15 +1,6 @@ docker_package_names: - # At one point, docker-compose runs started failing when pulling and building - # external images (on existing Ubuntu LTS installations no less!). The fix is - # to switch to `docker compose` (instead of `docker-compose`), but - get this - # - it's not installed by default, and needs the docker-compose-v2 package. - # Additionally, buildx is for some reason is still not installed by default, - # and builds might produce errors. This was first discovered on Noble; - # probably will need to specify different package lists for different distros - # later on, sigh. - docker.io - docker-buildx - docker-compose - - docker-compose-v2 docker_prune_module_deps: - python3-requests diff --git a/roles/docker/vars/Ubuntu_noble.yml b/roles/docker/vars/Ubuntu_noble.yml new file mode 100644 index 0000000..2332e31 --- /dev/null +++ b/roles/docker/vars/Ubuntu_noble.yml @@ -0,0 +1,12 @@ +docker_package_names: + # At one point, docker-compose runs started failing when pulling and building + # external images (on existing Ubuntu LTS installations no less!). The fix is + # to switch to `docker compose` (instead of `docker-compose`), but - get this + # - it's not installed by default, and needs the docker-compose-v2 package. + # This was first discovered on Noble. + - docker.io + - docker-buildx + - docker-compose + - docker-compose-v2 +docker_prune_module_deps: + - python3-requests |