Use the docker compose plugin instead of a standalone binary
- install docker-compose-plugin from the docker repo and remove /usr/local/bin/docker-compose (pinned 2.29.0) - remove the legacy download_docker_com_linux_debian.list (no signed-by), which made apt refuse the docker sources Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
dca5cb5360
commit
07e3ca8ed0
2 files changed
+13
-7
No files matched your search
@@ -4,4 +4,3 @@ cloud_storage: /opt/storage
|
|||||||
cloud_stage: prod
|
cloud_stage: prod
|
||||||
cloud_update: false
|
cloud_update: false
|
||||||
|
|
||||||
docker_compose_version: 2.29.0
|
|
||||||
+13
-6
@@ -24,6 +24,13 @@
|
|||||||
dest: /etc/apt/keyrings/docker.asc
|
dest: /etc/apt/keyrings/docker.asc
|
||||||
mode: '0644'
|
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
|
# write the whole file so repo lines of older releases do not linger
|
||||||
- name: Add Docker repository
|
- name: Add Docker repository
|
||||||
copy:
|
copy:
|
||||||
@@ -45,11 +52,11 @@
|
|||||||
pkg:
|
pkg:
|
||||||
- docker-ce
|
- docker-ce
|
||||||
- docker-ce-cli
|
- docker-ce-cli
|
||||||
|
- docker-compose-plugin
|
||||||
- python3-docker
|
- python3-docker
|
||||||
|
|
||||||
# Docker Compose
|
# Docker Compose: use the "docker compose" plugin from the docker repo
|
||||||
- name: download latest docker
|
- name: remove standalone docker-compose binary
|
||||||
get_url:
|
file:
|
||||||
url: "https://github.com/docker/compose/releases/download/v{{ docker_compose_version }}/docker-compose-linux-{{ ansible_architecture }}"
|
path: /usr/local/bin/docker-compose
|
||||||
dest: /usr/local/bin/docker-compose
|
state: absent
|
||||||
mode: 0755
|
|
||||||
Reference in new issue
Block a user