Skip to content

Commit 3742fbb

Browse files
authored
Merge pull request CactuseSecurity#2805 from tpurschke/cactus-develop
fix debian trixie build
2 parents 11a3203 + 69a7b51 commit 3742fbb

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

roles/docker/tasks/main.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,14 @@
11
---
22
- block:
3-
- set_fact: ansible_user="{{ lookup('env','USER') }}"
4-
3+
- set_fact:
4+
ansible_user: "{{ lookup('env','USER') }}"
5+
os_codename: "{{ ansible_lsb.codename | lower }}"
6+
7+
# for trixie there is no docker image yet
8+
- set_fact:
9+
os_codename: bookworm
10+
when: "os_codename == 'trixie'"
11+
512
- name: Install packages for docker download n installation
613
package:
714
name: "{{ item }}"
@@ -26,7 +33,7 @@
2633
path: "/etc/apt/sources.list.d/docker.list"
2734
create: true
2835
regexp: 'download.docker.com'
29-
line: "deb [arch=amd64] https://download.docker.com/linux/{{ ansible_distribution | lower }} {{ ansible_lsb.codename | lower }} stable"
36+
line: "deb [arch=amd64] https://download.docker.com/linux/{{ ansible_distribution | lower }} {{ os_codename }} stable"
3037

3138
- name: apt update
3239
apt: update_cache=true

0 commit comments

Comments
 (0)