mirror/matrix-docker-ansible-deploy
1
0
Fork 0
mirror of https://github.com/spantaleev/matrix-docker-ansible-deploy.git synced 2024-12-26 02:48:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix self-building for matrix-ma1sd on non-version tag/branch

Browse Source 
Building `master` or something like this was failing.
This commit is contained in:
Slavi Pantaleev 2021-01-14 23:57:38 +02:00
parent 9e936e45ad
commit 26f0bbfdef
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,10 +5,13 @@ matrix_ma1sd_enabled: true
matrix_ma1sd_container_image_self_build: false matrix_ma1sd_container_image_self_build: false
matrix_ma1sd_container_image_self_build_repo: "https://github.com/ma1uta/ma1sd.git" matrix_ma1sd_container_image_self_build_repo: "https://github.com/ma1uta/ma1sd.git"
matrix_ma1sd_container_image_self_build_branch: "{{ matrix_ma1sd_version }}"
matrix_ma1sd_architecture: "amd64" matrix_ma1sd_architecture: "amd64"
matrix_ma1sd_docker_image: "{{ matrix_ma1sd_docker_image_name_prefix }}ma1uta/ma1sd:2.4.0-{{ matrix_ma1sd_architecture }}" matrix_ma1sd_version: "2.4.0"
matrix_ma1sd_docker_image: "{{ matrix_ma1sd_docker_image_name_prefix }}ma1uta/ma1sd:{{ matrix_ma1sd_version }}-{{ matrix_ma1sd_architecture }}"
matrix_ma1sd_docker_image_name_prefix: "{{ 'localhost/' if matrix_ma1sd_container_image_self_build else 'docker.io/' }}" matrix_ma1sd_docker_image_name_prefix: "{{ 'localhost/' if matrix_ma1sd_container_image_self_build else 'docker.io/' }}"
matrix_ma1sd_docker_image_force_pull: "{{ matrix_ma1sd_docker_image.endswith(':latest') }}" matrix_ma1sd_docker_image_force_pull: "{{ matrix_ma1sd_docker_image.endswith(':latest') }}"

13
roles/matrix-ma1sd/tasks/setup_install.yml
View File

@ -79,7 +79,7 @@
git: git:
repo: "{{ matrix_ma1sd_container_image_self_build_repo }}" repo: "{{ matrix_ma1sd_container_image_self_build_repo }}"
dest: "{{ matrix_ma1sd_docker_src_files_path }}" dest: "{{ matrix_ma1sd_docker_src_files_path }}"
version: "{{ matrix_ma1sd_docker_image.split(':')[1].split('-')[0] }}" version: "{{ matrix_ma1sd_container_image_self_build_branch }}"
force: "yes" force: "yes"
register: matrix_ma1sd_git_pull_results register: matrix_ma1sd_git_pull_results
@ -90,10 +90,13 @@
- name: Ensure ma1sd Docker image is tagged correctly - name: Ensure ma1sd Docker image is tagged correctly
docker_image: docker_image:
# The build script always tags the image with something like `ma1uta/ma1sd:2.4.0`. # The build script always tags the image with 2 tags:
# Remove the `-{{ matrix_ma1sd_architecture }}` suffix and our `localhost/` prefix (applied when self-building) # - based on the branch/version: e.g. `ma1uta/ma1sd:2.4.0` (when on `2.4.0`)
# to get to what has actually been built, so we can retag it as `{{ matrix_ma1sd_docker_image }}`. # or `ma1uta/ma1sd:2.4.0-19-ga71d32b` (when on a given commit for a pre-release)
name: "{{ matrix_ma1sd_docker_image.split('-')[0].replace('localhost/', '') }}" # - generic one: `ma1uta/ma1sd:latest-dev`
#
# It's hard to predict the first one, so we'll use the latter.
name: "ma1uta/ma1sd:latest-dev"
repository: "{{ matrix_ma1sd_docker_image }}" repository: "{{ matrix_ma1sd_docker_image }}"
force_tag: yes force_tag: yes
source: local source: local