Parcourir la source

Disable Docker container logging

`--log-driver=none` is used for all Docker containers now.

All these containers are started through systemd anyway and get logged in journald,
so there's no need for Docker to be logging the same thing using the default `json-file` driver.
Doing that was growing `/var/lib/docker/containers/..` infinitely until service/container restart.

As a result of this, things like `docker logs matrix-synapse` won't work anymore.
`journalctl -u matrix-synapse` is how one can see the logs.
pull/13/head
Slavi Pantaleev il y a 7 ans
Parent
révision
161854e6d7
11 fichiers modifiés avec 33 ajouts et 12 suppressions
  1. +11
    -0
      CHANGELOG.md
  2. +1
    -0
      roles/matrix-server/templates/systemd/matrix-corporal.service.j2
  3. +1
    -0
      roles/matrix-server/templates/systemd/matrix-coturn.service.j2
  4. +13
    -12
      roles/matrix-server/templates/systemd/matrix-goofys.service.j2
  5. +1
    -0
      roles/matrix-server/templates/systemd/matrix-mailer.service.j2
  6. +1
    -0
      roles/matrix-server/templates/systemd/matrix-mautrix-telegram.service.j2
  7. +1
    -0
      roles/matrix-server/templates/systemd/matrix-mxisd.service.j2
  8. +1
    -0
      roles/matrix-server/templates/systemd/matrix-nginx-proxy.service.j2
  9. +1
    -0
      roles/matrix-server/templates/systemd/matrix-postgres.service.j2
  10. +1
    -0
      roles/matrix-server/templates/systemd/matrix-riot-web.service.j2
  11. +1
    -0
      roles/matrix-server/templates/systemd/matrix-synapse.service.j2

+ 11
- 0
CHANGELOG.md Voir le fichier

@@ -1,3 +1,14 @@
# 2018-09-26

## Disabling Docker container logging

`--log-driver=none` is used for all Docker containers now.

All these containers are started through systemd anyway and get logged in journald, so there's no need for Docker to be logging the same thing using the default `json-file` driver. Doing that was growing `/var/lib/docker/containers/..` infinitely until service/container restart.

As a result of this, things like `docker logs matrix-synapse` won't work anymore. `journalctl -u matrix-synapse` is how one can see the logs.


# 2018-09-17

## Service discovery support


+ 1
- 0
roles/matrix-server/templates/systemd/matrix-corporal.service.j2 Voir le fichier

@@ -10,6 +10,7 @@ Type=simple
ExecStartPre=-/usr/bin/docker kill matrix-corporal
ExecStartPre=-/usr/bin/docker rm matrix-corporal
ExecStart=/usr/bin/docker run --rm --name matrix-corporal \
--log-driver=none \
--user={{ matrix_user_uid }}:{{ matrix_user_gid }} \
--network={{ matrix_docker_network }} \
{% if not matrix_nginx_proxy_enabled %}


+ 1
- 0
roles/matrix-server/templates/systemd/matrix-coturn.service.j2 Voir le fichier

@@ -8,6 +8,7 @@ Type=simple
ExecStartPre=-/usr/bin/docker kill matrix-coturn
ExecStartPre=-/usr/bin/docker rm matrix-coturn
ExecStart=/usr/bin/docker run --rm --name matrix-coturn \
--log-driver=none \
--user={{ matrix_user_uid }}:{{ matrix_user_gid }} \
-p 3478:3478 \
-p 3478:3478/udp \


+ 13
- 12
roles/matrix-server/templates/systemd/matrix-goofys.service.j2 Voir le fichier

@@ -8,18 +8,19 @@ Type=simple
ExecStartPre=-/usr/bin/docker kill %n
ExecStartPre=-/usr/bin/docker rm %n
ExecStart=/usr/bin/docker run --rm --name %n \
--user={{ matrix_user_uid }}:{{ matrix_user_gid }} \
-v /etc/passwd:/etc/passwd:ro \
-v /etc/group:/etc/group:ro \
--security-opt apparmor:unconfined \
--cap-add mknod \
--cap-add sys_admin \
--device=/dev/fuse \
-v {{ matrix_synapse_media_store_path }}:/s3:shared \
--env-file={{ matrix_environment_variables_data_path }}/goofys \
--entrypoint /bin/sh \
{{ matrix_docker_image_goofys }} \
-c 'goofys -f --storage-class=STANDARD_IA --region {{ matrix_s3_media_store_region }} --stat-cache-ttl 60m0s --type-cache-ttl 60m0s --dir-mode 0700 --file-mode 0700 {{ matrix_s3_media_store_bucket_name }} /s3'
--log-driver=none \
--user={{ matrix_user_uid }}:{{ matrix_user_gid }} \
-v /etc/passwd:/etc/passwd:ro \
-v /etc/group:/etc/group:ro \
--security-opt apparmor:unconfined \
--cap-add mknod \
--cap-add sys_admin \
--device=/dev/fuse \
-v {{ matrix_synapse_media_store_path }}:/s3:shared \
--env-file={{ matrix_environment_variables_data_path }}/goofys \
--entrypoint /bin/sh \
{{ matrix_docker_image_goofys }} \
-c 'goofys -f --storage-class=STANDARD_IA --region {{ matrix_s3_media_store_region }} --stat-cache-ttl 60m0s --type-cache-ttl 60m0s --dir-mode 0700 --file-mode 0700 {{ matrix_s3_media_store_bucket_name }} /s3'
TimeoutStartSec=5min
ExecStop=-/usr/bin/docker stop %n
ExecStop=-/usr/bin/docker kill %n


+ 1
- 0
roles/matrix-server/templates/systemd/matrix-mailer.service.j2 Voir le fichier

@@ -8,6 +8,7 @@ Type=simple
ExecStartPre=-/usr/bin/docker kill matrix-mailer
ExecStartPre=-/usr/bin/docker rm matrix-mailer
ExecStart=/usr/bin/docker run --rm --name matrix-mailer \
--log-driver=none \
--network={{ matrix_docker_network }} \
--env-file={{ matrix_environment_variables_data_path }}/env-mailer \
{{ matrix_docker_image_mailer }}


+ 1
- 0
roles/matrix-server/templates/systemd/matrix-mautrix-telegram.service.j2 Voir le fichier

@@ -10,6 +10,7 @@ Type=simple
ExecStartPre=-/usr/bin/docker kill matrix-mautrix-telegram
ExecStartPre=-/usr/bin/docker rm matrix-mautrix-telegram
ExecStart=/usr/bin/docker run --rm --name matrix-mautrix-telegram \
--log-driver=none \
-e "UID={{ matrix_user_uid }}" -e "GID={{ matrix_user_gid }}" \
--network={{ matrix_docker_network }} \
-v {{ matrix_mautrix_telegram_base_path }}:/data:z \


+ 1
- 0
roles/matrix-server/templates/systemd/matrix-mxisd.service.j2 Voir le fichier

@@ -12,6 +12,7 @@ Type=simple
ExecStartPre=-/usr/bin/docker kill matrix-mxisd
ExecStartPre=-/usr/bin/docker rm matrix-mxisd
ExecStart=/usr/bin/docker run --rm --name matrix-mxisd \
--log-driver=none \
--user={{ matrix_user_uid }}:{{ matrix_user_gid }} \
--network={{ matrix_docker_network }} \
{% if not matrix_nginx_proxy_enabled %}


+ 1
- 0
roles/matrix-server/templates/systemd/matrix-nginx-proxy.service.j2 Voir le fichier

@@ -18,6 +18,7 @@ Type=simple
ExecStartPre=-/usr/bin/docker kill matrix-nginx-proxy
ExecStartPre=-/usr/bin/docker rm matrix-nginx-proxy
ExecStart=/usr/bin/docker run --rm --name matrix-nginx-proxy \
--log-driver=none \
--network={{ matrix_docker_network }} \
-p 80:80 \
-p 443:443 \


+ 1
- 0
roles/matrix-server/templates/systemd/matrix-postgres.service.j2 Voir le fichier

@@ -10,6 +10,7 @@ ExecStartPre=-/usr/bin/docker rm matrix-postgres
ExecStartPre=-/usr/bin/mkdir {{ matrix_postgres_data_path }}
ExecStartPre=-/usr/bin/chown {{ matrix_user_uid }}:{{ matrix_user_gid }} {{ matrix_postgres_data_path }}
ExecStart=/usr/bin/docker run --rm --name matrix-postgres \
--log-driver=none \
--user={{ matrix_user_uid }}:{{ matrix_user_gid }} \
--network={{ matrix_docker_network }} \
--env-file={{ matrix_environment_variables_data_path }}/env-postgres-server-docker \


+ 1
- 0
roles/matrix-server/templates/systemd/matrix-riot-web.service.j2 Voir le fichier

@@ -8,6 +8,7 @@ Type=simple
ExecStartPre=-/usr/bin/docker kill matrix-riot-web
ExecStartPre=-/usr/bin/docker rm matrix-riot-web
ExecStart=/usr/bin/docker run --rm --name matrix-riot-web \
--log-driver=none \
--user={{ matrix_user_uid }}:{{ matrix_user_gid }} \
-v {{ matrix_riot_web_data_path }}/config.json:/riot-web/webapp/config.json:ro \
-v {{ matrix_riot_web_data_path }}/riot.im.conf:/data/riot.im.conf:ro \


+ 1
- 0
roles/matrix-server/templates/systemd/matrix-synapse.service.j2 Voir le fichier

@@ -26,6 +26,7 @@ ExecStartPre=-/usr/bin/docker rm matrix-synapse
ExecStartPre=/bin/sleep 5
{% endif %}
ExecStart=/usr/bin/docker run --rm --name matrix-synapse \
--log-driver=none \
--network={{ matrix_docker_network }} \
-p 8448:8448 \
{% if not matrix_nginx_proxy_enabled %}


Chargement…
Annuler
Enregistrer