mirror/matrix-docker-ansible-deploy
1
0
Fork 0
mirror of https://github.com/spantaleev/matrix-docker-ansible-deploy.git synced 2024-12-24 18:08:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix issues building ma1sd Docker image

Browse Source 
The tag format used in the `ma1sd` repo have change. Versions no longer
start with 'v', and when building for non-amd64, we also need to strip
off the '-$arch' bit from the Docker image name.

Further, when building the .jar file, `ma1sd` currently names the .jar
based on the project's directory, which we call 'docker-src'. This means
other parts of the `ma1sd` build can't find the .jar file. Remedy this
by ensuring that the dir is called `docker-src/ma1sd`.
This commit is contained in:
Matt Cengia 2020-07-17 13:57:47 +10:00
parent ddfc945fcf
commit b0e984136f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,7 +11,7 @@ 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" 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"

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

@ -54,7 +54,7 @@
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