Minor improvements to the baibot role
This commit is contained in:
		| @@ -8,9 +8,10 @@ | |||||||
|     owner: "{{ matrix_user_username }}" |     owner: "{{ matrix_user_username }}" | ||||||
|     group: "{{ matrix_user_groupname }}" |     group: "{{ matrix_user_groupname }}" | ||||||
|   with_items: |   with_items: | ||||||
|  |     - {path: "{{ matrix_bot_baibot_base_path }}", when: true} | ||||||
|     - {path: "{{ matrix_bot_baibot_config_path }}", when: true} |     - {path: "{{ matrix_bot_baibot_config_path }}", when: true} | ||||||
|     - {path: "{{ matrix_bot_baibot_data_path }}", when: true} |     - {path: "{{ matrix_bot_baibot_data_path }}", when: true} | ||||||
|     - {path: "{{ matrix_bot_baibot_container_src_files_path }}", when: matrix_bot_baibot_container_image_self_build} |     - {path: "{{ matrix_bot_baibot_container_src_files_path }}", when: "{{ matrix_bot_baibot_container_image_self_build }}"} | ||||||
|   when: "item.when | bool" |   when: "item.when | bool" | ||||||
|  |  | ||||||
| - name: Ensure baibot configuration installed | - name: Ensure baibot configuration installed | ||||||
| @@ -29,7 +30,7 @@ | |||||||
|     group: "{{ matrix_user_groupname }}" |     group: "{{ matrix_user_groupname }}" | ||||||
|     mode: 0640 |     mode: 0640 | ||||||
|  |  | ||||||
| - name: Ensure baibot image is pulled | - name: Ensure baibot container image is pulled | ||||||
|   community.docker.docker_image: |   community.docker.docker_image: | ||||||
|     name: "{{ matrix_bot_baibot_container_image }}" |     name: "{{ matrix_bot_baibot_container_image }}" | ||||||
|     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}" |     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}" | ||||||
| @@ -41,6 +42,8 @@ | |||||||
|   delay: "{{ devture_playbook_help_container_retries_delay }}" |   delay: "{{ devture_playbook_help_container_retries_delay }}" | ||||||
|   until: result is not failed |   until: result is not failed | ||||||
|  |  | ||||||
|  | - when: "matrix_bot_baibot_container_image_self_build | bool" | ||||||
|  |   block: | ||||||
|     - name: Ensure baibot repository is present on self-build |     - name: Ensure baibot repository is present on self-build | ||||||
|       ansible.builtin.git: |       ansible.builtin.git: | ||||||
|         repo: "{{ matrix_bot_baibot_container_repo }}" |         repo: "{{ matrix_bot_baibot_container_repo }}" | ||||||
| @@ -50,9 +53,8 @@ | |||||||
|       become: true |       become: true | ||||||
|       become_user: "{{ matrix_user_username }}" |       become_user: "{{ matrix_user_username }}" | ||||||
|       register: matrix_bot_baibot_git_pull_results |       register: matrix_bot_baibot_git_pull_results | ||||||
|   when: "matrix_bot_baibot_container_image_self_build | bool" |  | ||||||
|  |  | ||||||
| - name: Ensure baibot image is built |     - name: Ensure baibot container image is built | ||||||
|       community.docker.docker_image: |       community.docker.docker_image: | ||||||
|         name: "{{ matrix_bot_baibot_container_image }}" |         name: "{{ matrix_bot_baibot_container_image }}" | ||||||
|         source: build |         source: build | ||||||
| @@ -62,7 +64,6 @@ | |||||||
|           dockerfile: Dockerfile |           dockerfile: Dockerfile | ||||||
|           path: "{{ matrix_bot_baibot_container_src_files_path }}" |           path: "{{ matrix_bot_baibot_container_src_files_path }}" | ||||||
|           pull: true |           pull: true | ||||||
|   when: "matrix_bot_baibot_container_image_self_build | bool" |  | ||||||
|  |  | ||||||
| - name: Ensure baibot container network is created | - name: Ensure baibot container network is created | ||||||
|   community.general.docker_network: |   community.general.docker_network: | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user