Add source option to docker_image to fix deprecation warning

This commit is contained in:
Dan Arnfield 2019-05-21 10:29:12 -05:00
parent 3982f114af
commit db15791819
16 changed files with 16 additions and 1 deletions

View File

@ -11,6 +11,7 @@
- name: Ensure Appservice Discord image is pulled - name: Ensure Appservice Discord image is pulled
docker_image: docker_image:
name: "{{ matrix_appservice_discord_docker_image }}" name: "{{ matrix_appservice_discord_docker_image }}"
source: "pull"
- name: Ensure Appservice Discord base directory exists - name: Ensure Appservice Discord base directory exists
file: file:
@ -90,4 +91,3 @@
{{ matrix_synapse_app_service_config_files|default([]) }} {{ matrix_synapse_app_service_config_files|default([]) }}
+ +
{{ ["{{ matrix_synapse_app_service_config_file_appservice_discord }}"] | to_nice_json }} {{ ["{{ matrix_synapse_app_service_config_file_appservice_discord }}"] | to_nice_json }}

View File

@ -11,6 +11,7 @@
- name: Ensure Appservice IRC image is pulled - name: Ensure Appservice IRC image is pulled
docker_image: docker_image:
name: "{{ matrix_appservice_irc_docker_image }}" name: "{{ matrix_appservice_irc_docker_image }}"
source: "pull"
- name: Ensure Appservice IRC base directory exists - name: Ensure Appservice IRC base directory exists
file: file:

View File

@ -11,6 +11,7 @@
- name: Ensure Mautrix Facebook image is pulled - name: Ensure Mautrix Facebook image is pulled
docker_image: docker_image:
name: "{{ matrix_mautrix_facebook_docker_image }}" name: "{{ matrix_mautrix_facebook_docker_image }}"
source: "pull"
- name: Ensure Mautrix Facebook base directory exists - name: Ensure Mautrix Facebook base directory exists
file: file:

View File

@ -11,6 +11,7 @@
- name: Ensure Mautrix Telegram image is pulled - name: Ensure Mautrix Telegram image is pulled
docker_image: docker_image:
name: "{{ matrix_mautrix_telegram_docker_image }}" name: "{{ matrix_mautrix_telegram_docker_image }}"
source: "pull"
- name: Ensure Mautrix Telegram base directory exists - name: Ensure Mautrix Telegram base directory exists
file: file:

View File

@ -11,6 +11,7 @@
- name: Ensure Mautrix Whatsapp image is pulled - name: Ensure Mautrix Whatsapp image is pulled
docker_image: docker_image:
name: "{{ matrix_mautrix_whatsapp_docker_image }}" name: "{{ matrix_mautrix_whatsapp_docker_image }}"
source: "pull"
- name: Ensure Mautrix Whatsapp base directory exists - name: Ensure Mautrix Whatsapp base directory exists
file: file:

View File

@ -20,6 +20,7 @@
- name: Ensure Matrix Corporal Docker image is pulled - name: Ensure Matrix Corporal Docker image is pulled
docker_image: docker_image:
name: "{{ matrix_corporal_docker_image }}" name: "{{ matrix_corporal_docker_image }}"
source: "pull"
when: matrix_corporal_enabled|bool when: matrix_corporal_enabled|bool
- name: Ensure Matrix Corporal config installed - name: Ensure Matrix Corporal config installed

View File

@ -7,6 +7,7 @@
- name: Ensure Coturn image is pulled - name: Ensure Coturn image is pulled
docker_image: docker_image:
name: "{{ matrix_coturn_docker_image }}" name: "{{ matrix_coturn_docker_image }}"
source: "pull"
when: matrix_coturn_enabled|bool when: matrix_coturn_enabled|bool
- name: Ensure Coturn configuration path exists - name: Ensure Coturn configuration path exists

View File

@ -25,6 +25,7 @@
- name: Ensure Dimension image is pulled - name: Ensure Dimension image is pulled
docker_image: docker_image:
name: "{{ matrix_dimension_docker_image }}" name: "{{ matrix_dimension_docker_image }}"
source: "pull"
when: matrix_dimension_enabled|bool when: matrix_dimension_enabled|bool
- name: Ensure matrix-dimension.service installed - name: Ensure matrix-dimension.service installed

View File

@ -23,6 +23,7 @@
- name: Ensure mailer image is pulled - name: Ensure mailer image is pulled
docker_image: docker_image:
name: "{{ matrix_mailer_docker_image }}" name: "{{ matrix_mailer_docker_image }}"
source: "pull"
when: matrix_mailer_enabled|bool when: matrix_mailer_enabled|bool
- name: Ensure matrix-mailer.service installed - name: Ensure matrix-mailer.service installed

View File

@ -19,6 +19,7 @@
- name: Ensure mxisd image is pulled - name: Ensure mxisd image is pulled
docker_image: docker_image:
name: "{{ matrix_mxisd_docker_image }}" name: "{{ matrix_mxisd_docker_image }}"
source: "pull"
when: matrix_mxisd_enabled|bool when: matrix_mxisd_enabled|bool
- name: Ensure mxisd config installed - name: Ensure mxisd config installed

View File

@ -97,6 +97,7 @@
- name: Ensure nginx Docker image is pulled - name: Ensure nginx Docker image is pulled
docker_image: docker_image:
name: "{{ matrix_nginx_proxy_docker_image }}" name: "{{ matrix_nginx_proxy_docker_image }}"
source: "pull"
when: matrix_nginx_proxy_enabled|bool when: matrix_nginx_proxy_enabled|bool
- name: Ensure matrix-nginx-proxy.service installed - name: Ensure matrix-nginx-proxy.service installed

View File

@ -36,6 +36,7 @@
- name: Ensure certbot Docker image is pulled - name: Ensure certbot Docker image is pulled
docker_image: docker_image:
name: "{{ matrix_ssl_lets_encrypt_certbot_docker_image }}" name: "{{ matrix_ssl_lets_encrypt_certbot_docker_image }}"
source: "pull"
when: "matrix_ssl_retrieval_method == 'lets-encrypt'" when: "matrix_ssl_retrieval_method == 'lets-encrypt'"
- name: Obtain Let's Encrypt certificates - name: Obtain Let's Encrypt certificates

View File

@ -27,6 +27,7 @@
- name: Ensure postgres Docker image is pulled - name: Ensure postgres Docker image is pulled
docker_image: docker_image:
name: "{{ matrix_postgres_docker_image_to_use }}" name: "{{ matrix_postgres_docker_image_to_use }}"
source: "pull"
when: matrix_postgres_enabled|bool when: matrix_postgres_enabled|bool
# We always create these directories, even if an external Postgres is used, # We always create these directories, even if an external Postgres is used,

View File

@ -16,6 +16,7 @@
- name: Ensure riot-web Docker image is pulled - name: Ensure riot-web Docker image is pulled
docker_image: docker_image:
name: "{{ matrix_riot_web_docker_image }}" name: "{{ matrix_riot_web_docker_image }}"
source: "pull"
when: matrix_riot_web_enabled|bool when: matrix_riot_web_enabled|bool
- name: Ensure Matrix riot-web config files installed - name: Ensure Matrix riot-web config files installed

View File

@ -1,6 +1,7 @@
- name: Ensure Goofys Docker image is pulled - name: Ensure Goofys Docker image is pulled
docker_image: docker_image:
name: "{{ matrix_s3_goofys_docker_image }}" name: "{{ matrix_s3_goofys_docker_image }}"
source: "pull"
# This will throw a Permission Denied error if already mounted # This will throw a Permission Denied error if already mounted
- name: Check Matrix Goofys external storage mountpoint path - name: Check Matrix Goofys external storage mountpoint path

View File

@ -21,6 +21,7 @@
- name: Ensure Synapse Docker image is pulled - name: Ensure Synapse Docker image is pulled
docker_image: docker_image:
name: "{{ matrix_synapse_docker_image }}" name: "{{ matrix_synapse_docker_image }}"
source: "pull"
- name: Check if a Synapse signing key exists - name: Check if a Synapse signing key exists
stat: stat: