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

Merge pull request #588 from mattcen/fix-ma1sd-image-build

Browse Source 
Fix issues building ma1sd Docker image
This commit is contained in:
Slavi Pantaleev 2020-07-17 11:48:50 +03:00 committed by GitHub
commit b872053a50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
roles/matrix-ma1sd/defaults/main.yml
View File

@ -11,7 +11,8 @@ matrix_ma1sd_docker_image: "ma1uta/ma1sd:2.4.0-{{ matrix_ma1sd_architecture }}"
matrix_ma1sd_docker_image_force_pull: "{{ matrix_ma1sd_docker_image.endswith(':latest') }}" matrix_ma1sd_docker_image_force_pull: "{{ matrix_ma1sd_docker_image.endswith(':latest') }}"
matrix_ma1sd_base_path: "{{ matrix_base_data_path }}/ma1sd" matrix_ma1sd_base_path: "{{ matrix_base_data_path }}/ma1sd"
matrix_ma1sd_docker_src_files_path: "{{ matrix_ma1sd_base_path }}/docker-src" # We need the docker src directory to be named ma1sd. See: https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/588
matrix_ma1sd_docker_src_files_path: "{{ matrix_ma1sd_base_path }}/docker-src/ma1sd"
matrix_ma1sd_config_path: "{{ matrix_ma1sd_base_path }}/config" matrix_ma1sd_config_path: "{{ matrix_ma1sd_base_path }}/config"
matrix_ma1sd_data_path: "{{ matrix_ma1sd_base_path }}/data" matrix_ma1sd_data_path: "{{ matrix_ma1sd_base_path }}/data"

9
roles/matrix-ma1sd/tasks/setup_ma1sd.yml
View File

@ -54,13 +54,20 @@
git: git:
repo: https://github.com/ma1uta/ma1sd.git repo: https://github.com/ma1uta/ma1sd.git
dest: "{{ matrix_ma1sd_docker_src_files_path }}" dest: "{{ matrix_ma1sd_docker_src_files_path }}"
version: "v{{ matrix_ma1sd_docker_image.split(':')[1] }}" version: "{{ matrix_ma1sd_docker_image.split(':')[1].split('-')[0] }}"
force: "yes" force: "yes"
- name: Ensure ma1sd Docker image is built - name: Ensure ma1sd Docker image is built
shell: "./gradlew dockerBuild" shell: "./gradlew dockerBuild"
args: args:
chdir: "{{ matrix_ma1sd_docker_src_files_path }}" chdir: "{{ matrix_ma1sd_docker_src_files_path }}"
- name: Ensure ma1sd Docker image is tagged correctly
docker_image:
name: "{{ matrix_ma1sd_docker_image.split('-')[0] }}"
repository: "{{ matrix_ma1sd_docker_image }}"
force_tag: yes
source: local
when: "matrix_ma1sd_enabled|bool and matrix_ma1sd_container_image_self_build" when: "matrix_ma1sd_enabled|bool and matrix_ma1sd_container_image_self_build"
- name: Ensure ma1sd config installed - name: Ensure ma1sd config installed