diff --git a/roles/custom/matrix-bridge-appservice-kakaotalk/defaults/main.yml b/roles/custom/matrix-bridge-appservice-kakaotalk/defaults/main.yml index f39c7d24f..c81729c24 100644 --- a/roles/custom/matrix-bridge-appservice-kakaotalk/defaults/main.yml +++ b/roles/custom/matrix-bridge-appservice-kakaotalk/defaults/main.yml @@ -39,14 +39,12 @@ matrix_appservice_kakaotalk_node_container_image: "{{ matrix_appservice_kakaotal matrix_appservice_kakaotalk_node_container_image_registry_prefix: "{{ 'localhost/' if matrix_appservice_kakaotalk_container_image_self_build else matrix_appservice_kakaotalk_node_container_image_registry_prefix_upstream }}" matrix_appservice_kakaotalk_node_container_image_registry_prefix_upstream: "{{ matrix_appservice_kakaotalk_node_container_image_registry_prefix_upstream_default }}" matrix_appservice_kakaotalk_node_container_image_registry_prefix_upstream_default: "" -matrix_appservice_kakaotalk_node_container_image_force_pull: "{{ matrix_appservice_kakaotalk_node_container_image.endswith(':latest') }}" matrix_appservice_kakaotalk_version: 86c038fd2ffee5e0aebf65136f085cce7e38b54e matrix_appservice_kakaotalk_container_image: "{{ matrix_appservice_kakaotalk_container_image_registry_prefix }}fair/matrix-appservice-kakaotalk:{{ matrix_appservice_kakaotalk_version }}" matrix_appservice_kakaotalk_container_image_registry_prefix: "{{ 'localhost/' if matrix_appservice_kakaotalk_container_image_self_build else matrix_appservice_kakaotalk_container_image_registry_prefix_upstream }}" matrix_appservice_kakaotalk_container_image_registry_prefix_upstream: "{{ matrix_appservice_kakaotalk_container_image_registry_prefix_upstream_default }}" matrix_appservice_kakaotalk_container_image_registry_prefix_upstream_default: "" -matrix_appservice_kakaotalk_container_image_force_pull: "{{ matrix_appservice_kakaotalk_container_image.endswith(':latest') }}" matrix_appservice_kakaotalk_base_path: "{{ matrix_base_data_path }}/appservice-kakaotalk" matrix_appservice_kakaotalk_config_path: "{{ matrix_appservice_kakaotalk_base_path }}/config" diff --git a/roles/custom/matrix-bridge-appservice-kakaotalk/tasks/setup_install.yml b/roles/custom/matrix-bridge-appservice-kakaotalk/tasks/setup_install.yml index ad9e85963..db6979530 100644 --- a/roles/custom/matrix-bridge-appservice-kakaotalk/tasks/setup_install.yml +++ b/roles/custom/matrix-bridge-appservice-kakaotalk/tasks/setup_install.yml @@ -7,11 +7,9 @@ --- - name: Ensure matrix-appservice-kakaotalk image is pulled - community.docker.docker_image: + community.docker.docker_image_pull: name: "{{ matrix_appservice_kakaotalk_container_image }}" - source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}" - force_source: "{{ matrix_appservice_kakaotalk_container_image_force_pull 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_appservice_kakaotalk_container_image_force_pull }}" + pull: always when: not matrix_appservice_kakaotalk_container_image_self_build register: matrix_appservice_kakaotalk_container_image_pull_result retries: "{{ devture_playbook_help_container_retries_count }}" @@ -19,11 +17,9 @@ until: matrix_appservice_kakaotalk_container_image_pull_result is not failed - name: Ensure matrix-appservice-kakaotalk-node image is pulled - community.docker.docker_image: + community.docker.docker_image_pull: name: "{{ matrix_appservice_kakaotalk_node_container_image }}" - source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}" - force_source: "{{ matrix_appservice_kakaotalk_node_container_image_force_pull 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_appservice_kakaotalk_node_container_image_force_pull }}" + pull: always when: not matrix_appservice_kakaotalk_container_image_self_build register: matrix_appservice_kakaotalk_node_container_image_pull_result retries: "{{ devture_playbook_help_container_retries_count }}" @@ -56,28 +52,24 @@ when: "matrix_appservice_kakaotalk_container_image_self_build | bool" - name: Ensure matrix-appservice-kakaotalk-node Docker image is built - community.docker.docker_image: + community.docker.docker_image_build: name: "{{ matrix_appservice_kakaotalk_node_container_image }}" - source: build - force_source: "{{ matrix_appservice_kakaotalk_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_appservice_kakaotalk_git_pull_results.changed }}" - build: - dockerfile: Dockerfile - path: "{{ matrix_appservice_kakaotalk_container_src_files_path }}/node" - pull: true + dockerfile: Dockerfile + path: "{{ matrix_appservice_kakaotalk_container_src_files_path }}/node" + pull: true + rebuild: "{{ 'always' if matrix_appservice_kakaotalk_git_pull_results.changed | bool else 'never' }}" when: "matrix_appservice_kakaotalk_container_image_self_build | bool" + register: matrix_appservice_kakaotalk_node_container_image_build_result - name: Ensure matrix-appservice-kakaotalk Docker image is built - community.docker.docker_image: + community.docker.docker_image_build: name: "{{ matrix_appservice_kakaotalk_container_image }}" - source: build - force_source: "{{ matrix_appservice_kakaotalk_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_appservice_kakaotalk_git_pull_results.changed }}" - build: - dockerfile: Dockerfile - path: "{{ matrix_appservice_kakaotalk_container_src_files_path }}" - pull: true + dockerfile: Dockerfile + path: "{{ matrix_appservice_kakaotalk_container_src_files_path }}" + pull: true + rebuild: "{{ 'always' if matrix_appservice_kakaotalk_git_pull_results.changed | bool else 'never' }}" when: "matrix_appservice_kakaotalk_container_image_self_build | bool" + register: matrix_appservice_kakaotalk_container_image_build_result - name: Ensure matrix-appservice-kakaotalk-node config.json installed ansible.builtin.copy: @@ -138,4 +130,6 @@ or matrix_appservice_kakaotalk_systemd_service_result.changed | default(false) or matrix_appservice_kakaotalk_container_image_pull_result.changed | default(false) or matrix_appservice_kakaotalk_node_container_image_pull_result.changed | default(false) + or matrix_appservice_kakaotalk_container_image_build_result.changed | default(false) + or matrix_appservice_kakaotalk_node_container_image_build_result.changed | default(false) }} diff --git a/roles/custom/matrix-bridge-appservice-kakaotalk/tasks/validate_config.yml b/roles/custom/matrix-bridge-appservice-kakaotalk/tasks/validate_config.yml index 4b895bee6..445a6e775 100644 --- a/roles/custom/matrix-bridge-appservice-kakaotalk/tasks/validate_config.yml +++ b/roles/custom/matrix-bridge-appservice-kakaotalk/tasks/validate_config.yml @@ -25,6 +25,8 @@ - {'old': 'matrix_appservice_kakaotalk_node_docker_image_registry_prefix', 'new': 'matrix_appservice_kakaotalk_node_container_image_registry_prefix'} - {'old': 'matrix_appservice_kakaotalk_node_docker_image_registry_prefix_upstream', 'new': 'matrix_appservice_kakaotalk_node_container_image_registry_prefix_upstream'} - {'old': 'matrix_appservice_kakaotalk_node_docker_image_registry_prefix_upstream_default', 'new': 'matrix_appservice_kakaotalk_node_container_image_registry_prefix_upstream_default'} + - {'old': 'matrix_appservice_kakaotalk_container_image_force_pull', 'new': ' (the new community.docker.docker_image_pull module handles this natively)'} + - {'old': 'matrix_appservice_kakaotalk_node_container_image_force_pull', 'new': ' (the new community.docker.docker_image_pull module handles this natively)'} - name: Fail if required appservice-kakaotalk settings not defined ansible.builtin.fail: