mirror of
				https://github.com/spantaleev/matrix-docker-ansible-deploy.git
				synced 2025-11-04 00:58:56 +01:00 
			
		
		
		
	Merge pull request #1175 from Toorero/master
Added selfbuild functionality to mautrix-signal bridge
This commit is contained in:
		@@ -380,6 +380,7 @@ matrix_mautrix_signal_database_password: "{{ matrix_synapse_macaroon_secret_key
 | 
			
		||||
#
 | 
			
		||||
######################################################################
 | 
			
		||||
 | 
			
		||||
matrix_mautrix_signal_container_self_build: "{{ matrix_architecture not in ['arm64', 'amd64'] }}"
 | 
			
		||||
 | 
			
		||||
######################################################################
 | 
			
		||||
#
 | 
			
		||||
 
 | 
			
		||||
@@ -3,6 +3,10 @@
 | 
			
		||||
 | 
			
		||||
matrix_mautrix_signal_enabled: true
 | 
			
		||||
 | 
			
		||||
matrix_mautrix_signal_self_build: false
 | 
			
		||||
matrix_mautrix_signal_docker_repo: "https://mau.dev/tulir/mautrix-signal.git"
 | 
			
		||||
matrix_mautrix_signal_docker_src_files_path: "{{ matrix_base_data_path }}/mautrix-signal/docker-src"
 | 
			
		||||
 | 
			
		||||
matrix_mautrix_signal_version: latest
 | 
			
		||||
matrix_mautrix_signal_daemon_version: latest
 | 
			
		||||
# See: https://mau.dev/tulir/mautrix-signal/container_registry
 | 
			
		||||
 
 | 
			
		||||
@@ -8,13 +8,34 @@
 | 
			
		||||
      The matrix-bridge-mautrix-signal role needs to execute before the matrix-synapse role.
 | 
			
		||||
  when: "matrix_synapse_role_executed|default(False)"
 | 
			
		||||
 | 
			
		||||
- name: Ensure Mautrix Signal repository is present on self-build
 | 
			
		||||
  git:
 | 
			
		||||
    repo: "{{ matrix_mautrix_signal_docker_repo }}"
 | 
			
		||||
    dest: "{{ matrix_mautrix_signal_docker_src_files_path }}"
 | 
			
		||||
    force: "yes"
 | 
			
		||||
  register: matrix_mautrix_signal_git_pull_results
 | 
			
		||||
  when: "matrix_mautrix_signal_enabled|bool and matrix_mautrix_signal_container_self_build|bool"
 | 
			
		||||
 | 
			
		||||
- name: Ensure Mautrix Signal image is built
 | 
			
		||||
  docker_image:
 | 
			
		||||
    name: "{{ matrix_mautrix_signal_docker_image }}"
 | 
			
		||||
    source: build
 | 
			
		||||
    force_source: "{{ matrix_mautrix_signal_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_mailer_git_pull_results.changed }}"
 | 
			
		||||
    build:
 | 
			
		||||
      dockerfile: Dockerfile
 | 
			
		||||
      path: "{{ matrix_mautrix_signal_docker_src_files_path }}"
 | 
			
		||||
      pull: yes
 | 
			
		||||
  when: "matrix_mautrix_signal_enabled|bool and matrix_mautrix_signal_container_self_build|bool"
 | 
			
		||||
  
 | 
			
		||||
- name: Ensure Mautrix Signal image is pulled
 | 
			
		||||
  docker_image:
 | 
			
		||||
    name: "{{ matrix_mautrix_signal_docker_image }}"
 | 
			
		||||
    source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
 | 
			
		||||
    force_source: "{{ matrix_mautrix_signal_docker_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_mautrix_signal_docker_image_force_pull }}"
 | 
			
		||||
  when: matrix_mautrix_signal_enabled|bool
 | 
			
		||||
  when: "matrix_mautrix_signal_enabled|bool and not matrix_mautrix_signal_container_self_build|bool"
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
- name: Ensure Mautrix Signal Daemon image is pulled
 | 
			
		||||
  docker_image:
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user