Commit 658c5935 authored by nanahira's avatar nanahira

Merge branch 'master' into bullseye

parents ac280037 e0570ad1
Pipeline #2328 passed with stage
in 5 minutes and 36 seconds
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
- name: Docker apt 源 - name: Docker apt 源
become: true become: true
apt_repository: apt_repository:
repo: 'deb {{mirror_docker}}/linux/{{ docker_distribution }} {{ docker_distribution }} stable' repo: 'deb {{mirror_docker}}/linux/{{ ansible_distribution|lower }} {{ docker_distribution }} stable'
filename: docker filename: docker
when: ansible_os_family == 'Debian' when: ansible_os_family == 'Debian'
- name: 安装 Docker (apt) - name: 安装 Docker (apt)
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
become: true become: true
apt: apt:
name: python-backports-shutil-get-terminal-size,python-backports.ssl-match-hostname name: python-backports-shutil-get-terminal-size,python-backports.ssl-match-hostname
when: ansible_os_family == 'Debian' and ansible_distribution_release != 'sid' when: ansible_os_family == 'Debian' and ansible_distribution_release != 'sid' and ansible_distribution_release != 'focal'
- name: clean yum Docker - name: clean yum Docker
become: true become: true
yum: yum:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment