Compare commits
3 Commits
764eed6fe9
...
797f074cfa
Author | SHA1 | Date | |
---|---|---|---|
797f074cfa | |||
fe9ba2c439 | |||
450dff940a |
@ -33,6 +33,17 @@
|
|||||||
register: matrix_client_hydrogen_git_pull_results
|
register: matrix_client_hydrogen_git_pull_results
|
||||||
when: "matrix_client_hydrogen_enabled|bool and matrix_client_hydrogen_container_image_self_build|bool"
|
when: "matrix_client_hydrogen_enabled|bool and matrix_client_hydrogen_container_image_self_build|bool"
|
||||||
|
|
||||||
|
- name: Ensure Hydrogen Docker image is built
|
||||||
|
docker_image:
|
||||||
|
name: "{{ matrix_client_hydrogen_docker_image }}"
|
||||||
|
source: build
|
||||||
|
force_source: "{{ matrix_client_hydrogen_git_pull_results.changed }}"
|
||||||
|
build:
|
||||||
|
dockerfile: Dockerfile
|
||||||
|
path: "{{ matrix_client_hydrogen_docker_src_files_path }}"
|
||||||
|
pull: yes
|
||||||
|
when: "matrix_client_hydrogen_enabled|bool and matrix_client_hydrogen_container_image_self_build|bool"
|
||||||
|
|
||||||
- name: Ensure Hydrogen configuration installed
|
- name: Ensure Hydrogen configuration installed
|
||||||
copy:
|
copy:
|
||||||
content: "{{ matrix_client_hydrogen_configuration|to_nice_json }}"
|
content: "{{ matrix_client_hydrogen_configuration|to_nice_json }}"
|
||||||
@ -53,19 +64,6 @@
|
|||||||
- {src: "{{ role_path }}/templates/nginx.conf.j2", name: "nginx.conf"}
|
- {src: "{{ role_path }}/templates/nginx.conf.j2", name: "nginx.conf"}
|
||||||
when: "matrix_client_hydrogen_enabled|bool and item.src is not none"
|
when: "matrix_client_hydrogen_enabled|bool and item.src is not none"
|
||||||
|
|
||||||
# This step MUST come after the steps to install the configuration files because the config files
|
|
||||||
# are currently only read at build time, not at run time like most other components in the playbook
|
|
||||||
- name: Ensure Hydrogen Docker image is built
|
|
||||||
docker_image:
|
|
||||||
name: "{{ matrix_client_hydrogen_docker_image }}"
|
|
||||||
source: build
|
|
||||||
force_source: "{{ matrix_client_hydrogen_git_pull_results.changed }}"
|
|
||||||
build:
|
|
||||||
dockerfile: Dockerfile
|
|
||||||
path: "{{ matrix_client_hydrogen_docker_src_files_path }}"
|
|
||||||
pull: yes
|
|
||||||
when: "matrix_client_hydrogen_enabled|bool and matrix_client_hydrogen_container_image_self_build|bool"
|
|
||||||
|
|
||||||
- name: Ensure matrix-client-hydrogen.service installed
|
- name: Ensure matrix-client-hydrogen.service installed
|
||||||
template:
|
template:
|
||||||
src: "{{ role_path }}/templates/systemd/matrix-client-hydrogen.service.j2"
|
src: "{{ role_path }}/templates/systemd/matrix-client-hydrogen.service.j2"
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
matrix_grafana_enabled: false
|
matrix_grafana_enabled: false
|
||||||
|
|
||||||
matrix_grafana_version: 8.1.3
|
matrix_grafana_version: 8.1.2
|
||||||
matrix_grafana_docker_image: "{{ matrix_container_global_registry_prefix }}grafana/grafana:{{ matrix_grafana_version }}"
|
matrix_grafana_docker_image: "{{ matrix_container_global_registry_prefix }}grafana/grafana:{{ matrix_grafana_version }}"
|
||||||
matrix_grafana_docker_image_force_pull: "{{ matrix_grafana_docker_image.endswith(':latest') }}"
|
matrix_grafana_docker_image_force_pull: "{{ matrix_grafana_docker_image.endswith(':latest') }}"
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user