New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Docker journald logging #1420

Merged
merged 2 commits into from Aug 17, 2016
Jump to file or symbol
Failed to load files and symbols.
+2 −2
Diff settings

Always

Just for now

Next

Move log option and change to journald

  • Loading branch information...
sfranzen committed Aug 9, 2016
commit e1fe7e84047653e4c4ad7dfe28e8ace764b9476b
@@ -34,4 +34,4 @@ def main():
mount_share(so, mnt_pt)
except Exception, e:
sys.exit('Failed to mount Docker root(%s). Exception: %s' % (mnt_pt, e.__str__()))
run_command([DOCKER, '-d', '-s', 'btrfs', '-g', mnt_pt])
run_command([DOCKER, '-d', '--log-driver=journald', '-s', 'btrfs', '-g', mnt_pt])
@@ -39,7 +39,7 @@
DOCKER = '/usr/bin/docker'
ROCKON_URL = 'https://localhost/api/rockons'
DCMD = [DOCKER, 'run', '--log-driver=syslog', ]
DCMD = [DOCKER, 'run', ]
DCMD2 = list(DCMD) + ['-d', '--restart=unless-stopped', ]
import logging
ProTip! Use n and p to navigate between commits in a pull request.