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

Rename some variables for consistency

Browse Source
This commit is contained in:
Slavi Pantaleev
2020-03-15 10:15:27 +02:00
parent 8fe97abe7d
commit 2b85fde103
20 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
roles/matrix-riot-web/tasks/init.yml
View File

@ -7,4 +7,4 @@
- name: Fail if running on Ansible lower than 2.8 and trying self building
fail:
msg: "To self build Riot Web image, you should usa ansible 2.8 or higher. E.g. pip contains such packages."
when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_riot_web_self_build"
when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_riot_web_container_image_self_build"

8
roles/matrix-riot-web/tasks/setup_riot_web.yml
View File

@ -13,7 +13,7 @@
group: "{{ matrix_user_username }}"
with_items:
- "{{ matrix_riot_web_data_path }}"
- { src: "{{ matrix_riot_web_docker_src_files_path }}", when: "{{ matrix_riot_web_self_build }}" }
- { src: "{{ matrix_riot_web_docker_src_files_path }}", when: "{{ matrix_riot_web_container_image_self_build }}" }
when: matrix_riot_web_enabled|bool
- name: Ensure riot-web Docker image is pulled
@ -22,7 +22,7 @@
source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
force_source: "{{ matrix_riot_web_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_riot_web_docker_image_force_pull }}"
when: matrix_riot_web_enabled|bool and not matrix_riot_web_self_build
when: matrix_riot_web_enabled|bool and not matrix_riot_web_container_image_self_build
- name: Ensure Riot Web repository is present on self-build
git:
@ -30,7 +30,7 @@
dest: "{{ matrix_riot_web_docker_src_files_path }}"
version: "{{ matrix_riot_web_docker_image.split(':')[1] }}"
force: "yes"
when: "matrix_riot_web_enabled|bool and matrix_riot_web_self_build"
when: "matrix_riot_web_enabled|bool and matrix_riot_web_container_image_self_build"
- name: Ensure Riot Web Docker image is build
docker_image:
@ -40,7 +40,7 @@
dockerfile: Dockerfile
path: "{{ matrix_riot_web_docker_src_files_path }}"
pull: yes
when: "matrix_riot_web_enabled|bool and matrix_riot_web_self_build"
when: "matrix_riot_web_enabled|bool and matrix_riot_web_container_image_self_build"
- name: Ensure Matrix riot-web configuration installed
copy: