refactor based on Slavi's requests

This commit is contained in:
Horvath Gergely
2020-03-08 00:24:00 +01:00
parent d53d63ab07
commit 310aa685f9
17 changed files with 96 additions and 101 deletions

View File

@ -14,6 +14,7 @@
with_items:
- "{{ matrix_mxisd_config_path }}"
- "{{ matrix_mxisd_data_path }}"
- { src: "{{ matrix_docker_mxisd_src_files_path }}", when: "{{ matrix_mxisd_self_build }}"}
when: matrix_mxisd_enabled|bool
- name: Ensure mxisd image is pulled
@ -22,39 +23,29 @@
source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
force_source: "{{ matrix_mxisd_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_mxisd_docker_image_force_pull }}"
when: matrix_mxisd_enabled|bool and not matrix_raspberry_pi
when: matrix_mxisd_enabled|bool and not matrix_mxisd_self_build
- name: Ensure gradel is installed on Raspberry pi for building
- name: Ensure gradel is installed for self-building
apt:
name:
- gradle
state: present
update_cache: yes
when: "matrix_mxisd_enabled|bool and matrix_raspberry_pi"
when: "matrix_mxisd_enabled|bool and matrix_mxisd_self_build"
- name: Ensure mxisd repository is present on Raspberry pi
- name: Ensure mxisd repository is present on self-build
git:
repo: https://github.com/kamax-matrix/mxisd.git
dest: "{{ matrix_docker_mxisd_src_files_path }}"
version: "v{{ matrix_mxisd_docker_image.split(':')[1] }}"
force: "yes"
when: "matrix_mxisd_enabled|bool and matrix_raspberry_pi"
when: "matrix_mxisd_enabled|bool and matrix_mxisd_self_build"
# - name: Ensure mxisd Docker image is build (Raspberry pi)
# docker_image:
# name: "{{ matrix_mxisd_docker_image }}"
# source: build
# build:
# dockerfile: Dockerfile
# path: "{{ matrix_docker_mxisd_src_files_path }}"
# pull: yes
# when: "matrix_mxisd_enabled|bool and matrix_raspberry_pi"
- name: Ensure mxisd Docker image is build (Raspberry pi)
- name: Ensure mxisd Docker image is build
shell: "./gradlew dockerBuild"
args:
chdir: "{{ matrix_docker_mxisd_src_files_path }}"
when: "matrix_mxisd_enabled|bool and matrix_raspberry_pi"
when: "matrix_mxisd_enabled|bool and matrix_mxisd_self_build"
- name: Ensure mxisd config installed
copy: