finallycoffee/matrix-docker-ansible-deploy
finallycoffee/matrix-docker-ansible-deploy
5
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix self-building for Coturn

Browse Source 
Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/1023

Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/1009
This commit is contained in:
Slavi Pantaleev 2021-04-24 20:31:25 +03:00
parent 389dc26615
commit 689dcea773
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
roles/matrix-coturn/defaults/main.yml
View File

@ -1,7 +1,9 @@
matrix_coturn_enabled: true matrix_coturn_enabled: true
matrix_coturn_container_image_self_build: false matrix_coturn_container_image_self_build: false
matrix_coturn_container_image_self_build_repo: "https://github.com/coturn/coturn/tree/master/docker/coturn/alpine.git" matrix_coturn_container_image_self_build_repo: "https://github.com/coturn/coturn"
matrix_coturn_container_image_self_build_repo_version: "upstream/{{ matrix_coturn_version }}"
matrix_coturn_container_image_self_build_repo_dockerfile_path: "docker/coturn/alpine/Dockerfile"
matrix_coturn_version: 4.5.2 matrix_coturn_version: 4.5.2
matrix_coturn_docker_image: "{{ matrix_coturn_docker_image_name_prefix }}coturn/coturn:{{ matrix_coturn_version }}-alpine" matrix_coturn_docker_image: "{{ matrix_coturn_docker_image_name_prefix }}coturn/coturn:{{ matrix_coturn_version }}-alpine"

4
roles/matrix-coturn/tasks/setup_install.yml
View File

@ -30,7 +30,7 @@
git: git:
repo: "{{ matrix_coturn_container_image_self_build_repo }}" repo: "{{ matrix_coturn_container_image_self_build_repo }}"
dest: "{{ matrix_coturn_docker_src_files_path }}" dest: "{{ matrix_coturn_docker_src_files_path }}"
version: "{{ matrix_coturn_docker_image.split(':')[1] }}" version: "{{ matrix_coturn_container_image_self_build_repo_version }}"
force: "yes" force: "yes"
register: matrix_coturn_git_pull_results register: matrix_coturn_git_pull_results
@ -40,7 +40,7 @@
source: build source: build
force_source: "{{ matrix_coturn_git_pull_results.changed }}" force_source: "{{ matrix_coturn_git_pull_results.changed }}"
build: build:
dockerfile: Dockerfile dockerfile: "{{ matrix_coturn_container_image_self_build_repo_dockerfile_path }}"
path: "{{ matrix_coturn_docker_src_files_path }}" path: "{{ matrix_coturn_docker_src_files_path }}"
pull: yes pull: yes
when: "matrix_coturn_container_image_self_build|bool" when: "matrix_coturn_container_image_self_build|bool"