|
|
@@ -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`. |
|
|
|
|
|
# Remove the `-{{ matrix_ma1sd_architecture }}` suffix and our `localhost/` prefix (applied when self-building) |
|
|
|
|
|
# to get to what has actually been built, so we can retag it as `{{ matrix_ma1sd_docker_image }}`. |
|
|
|
|
|
name: "{{ matrix_ma1sd_docker_image.split('-')[0].replace('localhost/', '') }}" |
|
|
|
|
|
|
|
|
# The build script always tags the image with 2 tags: |
|
|
|
|
|
# - based on the branch/version: e.g. `ma1uta/ma1sd:2.4.0` (when on `2.4.0`) |
|
|
|
|
|
# or `ma1uta/ma1sd:2.4.0-19-ga71d32b` (when on a given commit for a pre-release) |
|
|
|
|
|
# - 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 |
|
|
|