mirror/ infrastructure
1
1
Fork 0
mirror of https://gitlab.archlinux.org/archlinux/infrastructure.git synced 2024-05-26 22:26:03 +02:00
Code Issues

Merge branch 'ticket_326' into 'master' 

Push docker logs to journald

Closes #326

See merge request archlinux/infrastructure!480
This commit is contained in:
Kristian Klausen 2021-10-02 12:02:56 +00:00
parent 19afd18b9c 9255c4a745
commit 0bd66f1868
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
roles/gitlab/tasks/main.yml
View File

@ -19,6 +19,7 @@
network_mode: host
pull: true
restart_policy: always
log_driver: journald
env:
# See https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-config-template/gitlab.rb.template
# 1. In order to figure out what needs to go into 'idp_cert_fingerprint', run

3
roles/gitlab_runner/files/daemon.json
View File

@ -1,5 +1,6 @@
{
"ipv6": true,
"fixed-cidr-v6": "fd00::/80",
"cgroup-parent": "docker.slice"
"cgroup-parent": "docker.slice",
"log-driver": "journald"
}