Minor improvements to the baibot role

This commit is contained in:
Slavi Pantaleev 2024-10-18 21:00:19 +03:00
parent e524d218df
commit e7128055f7

View File

@ -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,28 +42,28 @@
delay: "{{ devture_playbook_help_container_retries_delay }}" delay: "{{ devture_playbook_help_container_retries_delay }}"
until: result is not failed until: result is not failed
- name: Ensure baibot repository is present on self-build - when: "matrix_bot_baibot_container_image_self_build | bool"
ansible.builtin.git: block:
repo: "{{ matrix_bot_baibot_container_repo }}" - name: Ensure baibot repository is present on self-build
version: "{{ matrix_bot_baibot_container_repo_version }}" ansible.builtin.git:
dest: "{{ matrix_bot_baibot_container_src_files_path }}" repo: "{{ matrix_bot_baibot_container_repo }}"
force: "yes" version: "{{ matrix_bot_baibot_container_repo_version }}"
become: true dest: "{{ matrix_bot_baibot_container_src_files_path }}"
become_user: "{{ matrix_user_username }}" force: "yes"
register: matrix_bot_baibot_git_pull_results become: true
when: "matrix_bot_baibot_container_image_self_build | bool" become_user: "{{ matrix_user_username }}"
register: matrix_bot_baibot_git_pull_results
- 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
force_source: "{{ matrix_bot_baibot_git_pull_results.changed if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}" force_source: "{{ matrix_bot_baibot_git_pull_results.changed if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
force: "{{ omit if ansible_version.major > 2 or ansible_version.minor >= 8 else matrix_bot_baibot_git_pull_results.changed }}" force: "{{ omit if ansible_version.major > 2 or ansible_version.minor >= 8 else matrix_bot_baibot_git_pull_results.changed }}"
build: build:
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: