소스 검색

update docker role to work with CentOS Stream 9

Blaine Story 2 년 전
부모
커밋
6538754c50
3개의 변경된 파일6개의 추가작업 그리고 6개의 파일을 삭제
  1. 2 2
      roles/docker/tasks/main.yml
  2. 1 1
      roles/docker/templates/docker-pull.sh.j2
  3. 3 3
      roles/docker/templates/service.j2

+ 2 - 2
roles/docker/tasks/main.yml

@@ -23,8 +23,8 @@
       yum:
         name:
           - docker-ce
-          - docker-compose
-          - python-docker-py
+          - docker-compose-plugin
+          - python3-requests # for docker_network module
         state: present
   when:
     - ansible_distribution == 'CentOS'

+ 1 - 1
roles/docker/templates/docker-pull.sh.j2

@@ -4,7 +4,7 @@
 declare -a arr=({{ containers | map(attribute='name') | flatten | map('regex_replace', '^(.*)$', '"\\1"') | flatten | join(' ') }})
 
 for i in "${arr[@]}"; do
-  output=$(docker-compose -f /root/docker/$i/docker-compose.yml pull)
+  output=$(docker{% if ansible_distribution_major_version|int == 9 %} {% else %}-{% endif %}compose -f /root/docker/$i/docker-compose.yml pull)
 
   if [[ $(echo $output | grep 'Downloaded newer image') ]]; then
     systemctl restart $i

+ 3 - 3
roles/docker/templates/service.j2

@@ -9,9 +9,9 @@ Restart=always
 User=root
 Group=docker
 
-ExecStartPre=/usr/bin/docker-compose -f /root/docker/{{ item }}/docker-compose.yml down -v
-ExecStart=/usr/bin/docker-compose -f /root/docker/{{ item }}/docker-compose.yml up
-ExecStop=/usr/bin/docker-compose -f /root/docker/{{ item }}/docker-compose.yml down -v
+ExecStartPre=/usr/bin/docker{% if ansible_distribution_major_version|int == 9 %} {% else %}-{% endif %}compose -f /root/docker/{{ item }}/docker-compose.yml down -v
+ExecStart=/usr/bin/docker{% if ansible_distribution_major_version|int == 9 %} {% else %}-{% endif %}compose -f /root/docker/{{ item }}/docker-compose.yml up
+ExecStop=/usr/bin/docker{% if ansible_distribution_major_version|int == 9 %} {% else %}-{% endif %}compose -f /root/docker/{{ item }}/docker-compose.yml down -v
 
 [Install]
 WantedBy=multi-user.target