diff --git a/defaults/main.yml b/defaults/main.yml index b97dfb5..1bfe95a 100755 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -4,4 +4,3 @@ cloud_storage: /opt/storage cloud_stage: prod cloud_update: false -docker_compose_version: 2.29.0 \ No newline at end of file diff --git a/tasks/main.yml b/tasks/main.yml index f1cba72..a08f3ad 100755 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -24,6 +24,13 @@ dest: /etc/apt/keyrings/docker.asc mode: '0644' +# older versions of this role created this file without signed-by; apt +# refuses two docker sources with different Signed-By values +- name: remove legacy docker repository file + file: + path: /etc/apt/sources.list.d/download_docker_com_linux_debian.list + state: absent + # write the whole file so repo lines of older releases do not linger - name: Add Docker repository copy: @@ -45,11 +52,11 @@ pkg: - docker-ce - docker-ce-cli + - docker-compose-plugin - python3-docker -# Docker Compose -- name: download latest docker - get_url: - url: "https://github.com/docker/compose/releases/download/v{{ docker_compose_version }}/docker-compose-linux-{{ ansible_architecture }}" - dest: /usr/local/bin/docker-compose - mode: 0755 \ No newline at end of file +# Docker Compose: use the "docker compose" plugin from the docker repo +- name: remove standalone docker-compose binary + file: + path: /usr/local/bin/docker-compose + state: absent