Просмотр исходного кода

Use more fully-qualified container images

This is both for consistency with 93cc71cb69976c
and for making things more obvious.
pull/720/head
Slavi Pantaleev 5 лет назад
Родитель
Сommit
ccabc82d4c
12 измененных файлов: 20 добавлений и 20 удалений
  1. +1
    -1
      roles/matrix-bot-matrix-reminder-bot/defaults/main.yml
  2. +1
    -1
      roles/matrix-bridge-appservice-discord/defaults/main.yml
  3. +1
    -1
      roles/matrix-bridge-appservice-irc/defaults/main.yml
  4. +1
    -1
      roles/matrix-bridge-appservice-slack/defaults/main.yml
  5. +1
    -1
      roles/matrix-bridge-appservice-webhooks/defaults/main.yml
  6. +1
    -1
      roles/matrix-bridge-sms/defaults/main.yml
  7. +1
    -1
      roles/matrix-corporal/defaults/main.yml
  8. +1
    -1
      roles/matrix-dimension/defaults/main.yml
  9. +1
    -1
      roles/matrix-email2matrix/defaults/main.yml
  10. +4
    -4
      roles/matrix-jitsi/defaults/main.yml
  11. +2
    -2
      roles/matrix-nginx-proxy/defaults/main.yml
  12. +5
    -5
      roles/matrix-postgres/defaults/main.yml

+ 1
- 1
roles/matrix-bot-matrix-reminder-bot/defaults/main.yml Просмотреть файл

@@ -3,7 +3,7 @@

matrix_bot_matrix_reminder_bot_enabled: true

matrix_bot_matrix_reminder_bot_docker_image: "anoa/matrix-reminder-bot:release-v0.2.0"
matrix_bot_matrix_reminder_bot_docker_image: "docker.io/anoa/matrix-reminder-bot:release-v0.2.0"
matrix_bot_matrix_reminder_bot_docker_image_force_pull: "{{ matrix_bot_matrix_reminder_bot_docker_image.endswith(':latest') }}"

matrix_bot_matrix_reminder_bot_base_path: "{{ matrix_base_data_path }}/matrix-reminder-bot"


+ 1
- 1
roles/matrix-bridge-appservice-discord/defaults/main.yml Просмотреть файл

@@ -3,7 +3,7 @@

matrix_appservice_discord_enabled: true

matrix_appservice_discord_docker_image: "halfshot/matrix-appservice-discord:latest"
matrix_appservice_discord_docker_image: "docker.io/halfshot/matrix-appservice-discord:latest"
matrix_appservice_discord_docker_image_force_pull: "{{ matrix_appservice_discord_docker_image.endswith(':latest') }}"

matrix_appservice_discord_base_path: "{{ matrix_base_data_path }}/appservice-discord"


+ 1
- 1
roles/matrix-bridge-appservice-irc/defaults/main.yml Просмотреть файл

@@ -3,7 +3,7 @@

matrix_appservice_irc_enabled: true

matrix_appservice_irc_docker_image: "matrixdotorg/matrix-appservice-irc:release-0.17.1"
matrix_appservice_irc_docker_image: "docker.io/matrixdotorg/matrix-appservice-irc:release-0.17.1"
matrix_appservice_irc_docker_image_force_pull: "{{ matrix_appservice_irc_docker_image.endswith(':latest') }}"

matrix_appservice_irc_base_path: "{{ matrix_base_data_path }}/appservice-irc"


+ 1
- 1
roles/matrix-bridge-appservice-slack/defaults/main.yml Просмотреть файл

@@ -3,7 +3,7 @@

matrix_appservice_slack_enabled: true

matrix_appservice_slack_docker_image: "matrixdotorg/matrix-appservice-slack:release-1.5.0"
matrix_appservice_slack_docker_image: "docker.io/matrixdotorg/matrix-appservice-slack:release-1.5.0"
matrix_appservice_slack_docker_image_force_pull: "{{ matrix_appservice_slack_docker_image.endswith(':latest') }}"

matrix_appservice_slack_base_path: "{{ matrix_base_data_path }}/appservice-slack"


+ 1
- 1
roles/matrix-bridge-appservice-webhooks/defaults/main.yml Просмотреть файл

@@ -3,7 +3,7 @@

matrix_appservice_webhooks_enabled: true

matrix_appservice_webhooks_docker_image: "turt2live/matrix-appservice-webhooks:latest"
matrix_appservice_webhooks_docker_image: "docker.io/turt2live/matrix-appservice-webhooks:latest"
matrix_appservice_webhooks_docker_image_force_pull: "{{ matrix_appservice_webhooks_docker_image.endswith(':latest') }}"

matrix_appservice_webhooks_base_path: "{{ matrix_base_data_path }}/appservice-webhooks"


+ 1
- 1
roles/matrix-bridge-sms/defaults/main.yml Просмотреть файл

@@ -3,7 +3,7 @@

matrix_sms_bridge_enabled: true

matrix_sms_bridge_docker_image: "folivonet/matrix-sms-bridge:0.4.1.RELEASE"
matrix_sms_bridge_docker_image: "docker.io/folivonet/matrix-sms-bridge:0.4.1.RELEASE"

matrix_sms_bridge_base_path: "{{ matrix_base_data_path }}/matrix-sms-bridge"
matrix_sms_bridge_config_path: "{{ matrix_base_data_path }}/matrix-sms-bridge/config"


+ 1
- 1
roles/matrix-corporal/defaults/main.yml Просмотреть файл

@@ -19,7 +19,7 @@ matrix_corporal_container_extra_arguments: []
# List of systemd services that matrix-corporal.service depends on
matrix_corporal_systemd_required_services_list: ['docker.service']

matrix_corporal_docker_image: "devture/matrix-corporal:1.11.0"
matrix_corporal_docker_image: "docker.io/devture/matrix-corporal:1.11.0"
matrix_corporal_docker_image_force_pull: "{{ matrix_corporal_docker_image.endswith(':latest') }}"

matrix_corporal_base_path: "{{ matrix_base_data_path }}/corporal"


+ 1
- 1
roles/matrix-dimension/defaults/main.yml Просмотреть файл

@@ -12,7 +12,7 @@ matrix_dimension_widgets_allow_self_signed_ssl_certificates: false

matrix_dimension_base_path: "{{ matrix_base_data_path }}/dimension"

matrix_dimension_docker_image: "turt2live/matrix-dimension:latest"
matrix_dimension_docker_image: "docker.io/turt2live/matrix-dimension:latest"
matrix_dimension_docker_image_force_pull: "{{ matrix_dimension_docker_image.endswith(':latest') }}"

# The user and group id correspond to the node user in the `turt2live/matrix-dimension` image.


+ 1
- 1
roles/matrix-email2matrix/defaults/main.yml Просмотреть файл

@@ -3,7 +3,7 @@ matrix_email2matrix_enabled: true
matrix_email2matrix_base_path: "{{ matrix_base_data_path }}/email2matrix"
matrix_email2matrix_config_dir_path: "{{ matrix_email2matrix_base_path }}/config"

matrix_email2matrix_docker_image: "devture/email2matrix:1.0.1"
matrix_email2matrix_docker_image: "docker.io/devture/email2matrix:1.0.1"
matrix_email2matrix_docker_image_force_pull: "{{ matrix_email2matrix_docker_image.endswith(':latest') }}"

# A list of extra arguments to pass to the container


+ 4
- 4
roles/matrix-jitsi/defaults/main.yml Просмотреть файл

@@ -53,7 +53,7 @@ matrix_jitsi_enable_lobby: false

matrix_jitsi_container_image_tag: "stable-5142"

matrix_jitsi_web_docker_image: "jitsi/web:{{ matrix_jitsi_container_image_tag }}"
matrix_jitsi_web_docker_image: "docker.io/jitsi/web:{{ matrix_jitsi_container_image_tag }}"
matrix_jitsi_web_docker_image_force_pull: "{{ matrix_jitsi_web_docker_image.endswith(':latest') }}"

matrix_jitsi_web_base_path: "{{ matrix_base_data_path }}/jitsi/web"
@@ -114,7 +114,7 @@ matrix_jitsi_web_config_constraints_video_height_ideal: 720
matrix_jitsi_web_config_constraints_video_height_max: 720
matrix_jitsi_web_config_constraints_video_height_min: 240

matrix_jitsi_prosody_docker_image: "jitsi/prosody:{{ matrix_jitsi_container_image_tag }}"
matrix_jitsi_prosody_docker_image: "docker.io/jitsi/prosody:{{ matrix_jitsi_container_image_tag }}"
matrix_jitsi_prosody_docker_image_force_pull: "{{ matrix_jitsi_prosody_docker_image.endswith(':latest') }}"

matrix_jitsi_prosody_base_path: "{{ matrix_base_data_path }}/jitsi/prosody"
@@ -128,7 +128,7 @@ matrix_jitsi_prosody_container_extra_arguments: []
matrix_jitsi_prosody_systemd_required_services_list: ['docker.service']


matrix_jitsi_jicofo_docker_image: "jitsi/jicofo:{{ matrix_jitsi_container_image_tag }}"
matrix_jitsi_jicofo_docker_image: "docker.io/jitsi/jicofo:{{ matrix_jitsi_container_image_tag }}"
matrix_jitsi_jicofo_docker_image_force_pull: "{{ matrix_jitsi_jicofo_docker_image.endswith(':latest') }}"

matrix_jitsi_jicofo_base_path: "{{ matrix_base_data_path }}/jitsi/jicofo"
@@ -145,7 +145,7 @@ matrix_jitsi_jicofo_auth_user: focus
matrix_jitsi_jicofo_auth_password: ''


matrix_jitsi_jvb_docker_image: "jitsi/jvb:{{ matrix_jitsi_container_image_tag }}"
matrix_jitsi_jvb_docker_image: "docker.io/jitsi/jvb:{{ matrix_jitsi_container_image_tag }}"
matrix_jitsi_jvb_docker_image_force_pull: "{{ matrix_jitsi_jvb_docker_image.endswith(':latest') }}"

matrix_jitsi_jvb_base_path: "{{ matrix_base_data_path }}/jitsi/jvb"


+ 2
- 2
roles/matrix-nginx-proxy/defaults/main.yml Просмотреть файл

@@ -3,7 +3,7 @@ matrix_nginx_proxy_enabled: true
# We use an official nginx image, which we fix-up to run unprivileged.
# An alternative would be an `nginxinc/nginx-unprivileged` image, but
# that is frequently out of date.
matrix_nginx_proxy_docker_image: "nginx:1.19.4-alpine"
matrix_nginx_proxy_docker_image: "docker.io/nginx:1.19.4-alpine"
matrix_nginx_proxy_docker_image_force_pull: "{{ matrix_nginx_proxy_docker_image.endswith(':latest') }}"

matrix_nginx_proxy_base_path: "{{ matrix_base_data_path }}/nginx-proxy"
@@ -259,7 +259,7 @@ matrix_ssl_domains_to_obtain_certificates_for: []

# Controls whether to obtain production or staging certificates from Let's Encrypt.
matrix_ssl_lets_encrypt_staging: false
matrix_ssl_lets_encrypt_certbot_docker_image: "certbot/certbot:{{ matrix_ssl_architecture }}-v1.9.0"
matrix_ssl_lets_encrypt_certbot_docker_image: "docker.io/certbot/certbot:{{ matrix_ssl_architecture }}-v1.9.0"
matrix_ssl_lets_encrypt_certbot_docker_image_force_pull: "{{ matrix_ssl_lets_encrypt_certbot_docker_image.endswith(':latest') }}"
matrix_ssl_lets_encrypt_certbot_standalone_http_port: 2402
matrix_ssl_lets_encrypt_support_email: ~


+ 5
- 5
roles/matrix-postgres/defaults/main.yml Просмотреть файл

@@ -8,11 +8,11 @@ matrix_postgres_db_name: ""
matrix_postgres_base_path: "{{ matrix_base_data_path }}/postgres"
matrix_postgres_data_path: "{{ matrix_postgres_base_path }}/data"

matrix_postgres_docker_image_v9: "postgres:9.6.19-alpine"
matrix_postgres_docker_image_v10: "postgres:10.14-alpine"
matrix_postgres_docker_image_v11: "postgres:11.9-alpine"
matrix_postgres_docker_image_v12: "postgres:12.4-alpine"
matrix_postgres_docker_image_v13: "postgres:13.0-alpine"
matrix_postgres_docker_image_v9: "docker.io/postgres:9.6.19-alpine"
matrix_postgres_docker_image_v10: "docker.io/postgres:10.14-alpine"
matrix_postgres_docker_image_v11: "docker.io/postgres:11.9-alpine"
matrix_postgres_docker_image_v12: "docker.io/postgres:12.4-alpine"
matrix_postgres_docker_image_v13: "docker.io/postgres:13.0-alpine"
matrix_postgres_docker_image_latest: "{{ matrix_postgres_docker_image_v13 }}"

# This variable is assigned at runtime. Overriding its value has no effect.


Загрузка…
Отмена
Сохранить