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

Switch all remaining container volume mounting from `-v` to `--mount`

`--mount` is safer, as `-v` has the side-effect of creating the "source"
destination as a directory if it doesn't exist yet.
We don't need such magic.
pull/3093/head
Slavi Pantaleev 2 лет назад
Родитель
Сommit
ce2f541deb
6 измененных файлов: 8 добавлений и 8 удалений
  1. +2
    -2
      roles/custom/matrix-bridge-appservice-irc/tasks/setup_install.yml
  2. +1
    -1
      roles/custom/matrix-bridge-beeper-linkedin/templates/systemd/matrix-beeper-linkedin.service.j2
  3. +1
    -1
      roles/custom/matrix-bridge-hookshot/tasks/setup_install.yml
  4. +2
    -2
      roles/custom/matrix-bridge-mx-puppet-twitter/templates/systemd/matrix-mx-puppet-twitter.service.j2
  5. +1
    -1
      roles/custom/matrix-dynamic-dns/templates/systemd/matrix-dynamic-dns.service.j2
  6. +1
    -1
      roles/custom/matrix-prometheus-nginxlog-exporter/templates/systemd/matrix-prometheus-nginxlog-exporter.service.j2

+ 2
- 2
roles/custom/matrix-bridge-appservice-irc/tasks/setup_install.yml Просмотреть файл

@@ -148,8 +148,8 @@
{{ devture_systemd_docker_base_host_command_docker }} run --rm --name matrix-appservice-irc-gen
--user={{ matrix_user_uid }}:{{ matrix_user_gid }}
--cap-drop=ALL
-v {{ matrix_appservice_irc_config_path }}:/config:z
-v {{ matrix_appservice_irc_data_path }}:/data:z
--mount type=bind,src={{ matrix_appservice_irc_config_path }},dst=/config
--mount type=bind,src={{ matrix_appservice_irc_data_path }},dst=/data
--entrypoint=/bin/bash
{{ matrix_appservice_irc_docker_image }}
-c


+ 1
- 1
roles/custom/matrix-bridge-beeper-linkedin/templates/systemd/matrix-beeper-linkedin.service.j2 Просмотреть файл

@@ -26,7 +26,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \
--user={{ matrix_user_uid }}:{{ matrix_user_gid }} \
--cap-drop=ALL \
--network={{ matrix_beeper_linkedin_container_network }} \
-v {{ matrix_beeper_linkedin_config_path }}:/data:z \
--mount type=bind,src={{ matrix_beeper_linkedin_config_path }},dst=/data \
--workdir=/opt/linkedin-matrix \
{% for arg in matrix_beeper_linkedin_container_extra_arguments %}
{{ arg }} \


+ 1
- 1
roles/custom/matrix-bridge-hookshot/tasks/setup_install.yml Просмотреть файл

@@ -80,7 +80,7 @@
--name={{ matrix_hookshot_container_url }}-validate
--user={{ matrix_user_uid }}:{{ matrix_user_gid }}
--cap-drop=ALL
-v {{ matrix_hookshot_base_path }}/config.yml:/config.yml
--mount type=bind,src={{ matrix_hookshot_base_path }}/config.yml,dst=/config.yml,ro
{{ matrix_hookshot_docker_image }} node config/Config.js /config.yml
register: hookshot_config_validation_result
changed_when: false


+ 2
- 2
roles/custom/matrix-bridge-mx-puppet-twitter/templates/systemd/matrix-mx-puppet-twitter.service.j2 Просмотреть файл

@@ -29,8 +29,8 @@ ExecStart={{ devture_systemd_docker_base_host_command_docker }} run --rm --name
{% endif %}
-e CONFIG_PATH=/config/config.yaml \
-e REGISTRATION_PATH=/config/registration.yaml \
-v {{ matrix_mx_puppet_twitter_config_path }}:/config:z \
-v {{ matrix_mx_puppet_twitter_data_path }}:/data:z \
--mount type=bind,src={{ matrix_mx_puppet_twitter_config_path }},dst=/config \
--mount type=bind,src={{ matrix_mx_puppet_twitter_data_path }},dst=/data \
{% for arg in matrix_mx_puppet_twitter_container_extra_arguments %}
{{ arg }} \
{% endfor %}


+ 1
- 1
roles/custom/matrix-dynamic-dns/templates/systemd/matrix-dynamic-dns.service.j2 Просмотреть файл

@@ -20,7 +20,7 @@ ExecStart={{ devture_systemd_docker_base_host_command_docker }} run --rm --name
--network={{ matrix_docker_network }} \
-e PUID={{ matrix_user_uid }} \
-e PGID={{ matrix_user_gid }} \
-v {{ matrix_dynamic_dns_config_path }}:/config:z \
--mount type=bind,{{ matrix_dynamic_dns_config_path }},dst=/config \
{% for arg in matrix_dynamic_dns_container_extra_arguments %}
{{ arg }} \
{% endfor %}


+ 1
- 1
roles/custom/matrix-prometheus-nginxlog-exporter/templates/systemd/matrix-prometheus-nginxlog-exporter.service.j2 Просмотреть файл

@@ -29,7 +29,7 @@ ExecStart={{ devture_systemd_docker_base_host_command_docker }} run --rm --name
{% if matrix_prometheus_nginxlog_exporter_container_syslog_host_bind_port %}
-p {{ matrix_prometheus_nginxlog_exporter_container_syslog_host_bind_port }}:{{ matrix_prometheus_nginxlog_exporter_container_syslog_port }}/udp \
{% endif %}
-v {{ matrix_prometheus_nginxlog_exporter_config_path }}:/etc/prometheus-nginxlog-exporter:z \
--mount type=bind,{{ matrix_prometheus_nginxlog_exporter_config_path }},dst=/etc/prometheus-nginxlog-exporter \
{% for arg in matrix_prometheus_nginxlog_exporter_container_extra_arguments %}
{{ arg }} \
{% endfor %}


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