Commit Graph

6660 Commits

Author SHA1 Message Date
David Scott
ddee5f27f3 memlogd/logwrite: use the same naming convention as init
In e8786d73bb the logwrite package will
automatically append .log to every log.

In 5201049f2c the init package will send
stderr of a service `s` to a log named `s` and the stdout to `s.out`.
Therefore the files we create on disk are `s.log` and `s.out.log`.

This patch modifies the memlogd `logwrite` command-line wrapper to use
the same convention.

Note there is a confusing name clash between `pkg/logwrite` and `cmd/logwrite`
in `memlogd` modified here.

Signed-off-by: David Scott <dave.scott@docker.com>
2018-07-20 15:31:29 +01:00
Rolf Neugebauer
5d7c1b215a
Merge pull request #3124 from zx2c4-forks/wireguard-bump
wireguard: upgrade to 0.0.20180718
2018-07-19 08:13:41 +01:00
Jason A. Donenfeld
f8b14ba25a wireguard: upgrade to 0.0.20180718
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
2018-07-19 00:00:08 +02:00
Rolf Neugebauer
3520778dcf
Merge pull request #3122 from rn/kup
Kernel update to 4.17.7/4.14.56/4.9.113/4.4.141
2018-07-17 18:59:06 +01:00
Rolf Neugebauer
3a03177791 Update YAMLs to latest kernels
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2018-07-17 16:57:50 +01:00
Rolf Neugebauer
1896951b04 kernel: Tweak config for x86
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2018-07-17 15:00:23 +01:00
Rolf Neugebauer
f70fc83b1d kernel: Update to 4.17.7/4.14.56/4.9.113/4.4.141
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2018-07-17 13:48:18 +01:00
Rolf Neugebauer
aa37cf250f
Merge pull request #3121 from rn/authors
Update AUTHORS
2018-07-17 13:20:15 +01:00
Rolf Neugebauer
9b0173a183 Update AUTHORS
We had a few contributors to `moby/tool`. Since this is merged here
update AUTHORS list.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2018-07-17 11:51:17 +01:00
Rolf Neugebauer
090f461e7f
Merge pull request #3117 from steeve/patch-1
Change GCP metadata SSH keys URL
2018-07-16 20:40:59 +01:00
Rolf Neugebauer
358f1a812a
Merge pull request #3115 from justincormack/merge-moby-tool
Merge moby tool back into LinuxKit
2018-07-16 17:52:37 +01:00
Steeve Morin
0748457296 examples: Update linux/metadata:721562e6f3ba9b6c003f9e746ff7ee94796f5251
Signed-off-by: Steeve Morin <steeve.morin@gmail.com>
2018-07-16 18:50:01 +02:00
Justin Cormack
cf5cec204d
Update LinuxKit for merge of moby tool
- use the mkimage hashes that we had in LinuxKit as more up to date than tool.
- update docs
- move the code from moby under src/cmd/linuxkit

Signed-off-by: Justin Cormack <justin@specialbusservice.com>
2018-07-16 14:22:15 +01:00
Ian Campbell
5fd9470215
Merge pull request #3119 from ijc/containerd-v1.1.2
Containerd v1.1.2
2018-07-16 12:40:57 +01:00
Ian Campbell
1dfe16e570 Bump yml to pickup containerd v1.1.2
Signed-off-by: Ian Campbell <ijc@docker.com>
2018-07-16 10:57:37 +01:00
Ian Campbell
eb48b1284c Bump packages to new alpine w/ containerd v1.1.2
Signed-off-by: Ian Campbell <ijc@docker.com>
2018-07-16 10:29:41 +01:00
Ian Campbell
6b6596f881 alpine: Bump to containerd v1.1.2
Signed-off-by: Ian Campbell <ijc@docker.com>
2018-07-16 05:29:27 -04:00
Steeve Morin
33b6fc77ea Change GCP metadata SSH keys URL
According to [1] the URL is not sshKeys but ssh-keys now.

[1] https://cloud.google.com/compute/docs/storing-retrieving-metadata

Signed-off-by: Steeve Morin <steeve.morin@gmail.com>
2018-07-15 01:29:31 +02:00
Rolf Neugebauer
d05c9c0af6
Merge pull request #3116 from rn/kernel-up
Update kernels to 4.17.6/4.14.55/4.9.112/4.4.140 + test fixes
2018-07-14 21:42:31 +01:00
Rolf Neugebauer
68cacfe871 tests: Fix the kernel in some tests
These must have fallen through the crack during various
kernel updates. Move everything to the latest 4.14.x kernel.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@gmail.com>
2018-07-14 14:47:52 +01:00
Rolf Neugebauer
e3369b11a6 Update YAMLs to latest kernels
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@gmail.com>
2018-07-14 14:45:55 +01:00
Rolf Neugebauer
c9dc3b97de kernel: Update to 4.17.6/4.14.55/4.9.112/4.4.140
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@gmail.com>
2018-07-14 13:10:03 +01:00
Justin Cormack
021b5718f8
Merge moby/tool into LinuxKit
Note these ended up with unrelated histories in the export process.

Signed-off-by: Justin Cormack <justin@specialbusservice.com>
2018-07-14 11:26:02 +01:00
Justin Cormack
b807994372
Remove all the parts we do not need when merged back into LinuxKit
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2018-07-14 10:44:21 +01:00
Rolf Neugebauer
3e4a5342b2
Merge pull request #3113 from rn/test-fix
Update linuxkit/alpine for test cases
2018-07-13 21:35:46 +01:00
Rolf Neugebauer
6b6c93d9d8
Merge pull request #3114 from djs55/kmsg.stderr
Write stderr to /var/log/<name>.log
2018-07-13 13:45:54 +01:00
David Scott
887810a773 Update yml to linuxkit/kmsg:cf3dc833591838596427aac032c829ea592599d0
Signed-off-by: David Scott <dave.scott@docker.com>
2018-07-13 11:48:16 +01:00
David Scott
637b1bdb3f pkg/kmsg: write to stderr (instead of stdout)
Part of #3111

Signed-off-by: David Scott <dave.scott@docker.com>
2018-07-13 11:48:16 +01:00
David Scott
70385eb86e Update yml to linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
Signed-off-by: David Scott <dave@recoil.org>
2018-07-13 11:48:16 +01:00
David Scott
7c243a8e8b pkg/init: only create /var/log/onboot symlink if not using memlogd
When logging directly to files (the not-using-memlogd case) the onboot
services must log to /run/log because /var/log might be overmounted
by a persistent disk. Therefore we create a symlink at the end of
the onboot section.

When logging via memlogd, all logs are buffered until a logwrite service
starts, so no symlink is needed.

Signed-off-by: David Scott <dave.scott@docker.com>
2018-07-13 11:47:43 +01:00
David Scott
5201049f2c pkg/init: write stderr to <name> rather than <name>.err
This will then be written to disk as <name>.log by logwrite.

Part of #3111

Signed-off-by: David Scott <dave.scott@docker.com>
2018-07-13 10:48:31 +01:00
Justin Cormack
72e919f4b3
Merge pull request #3112 from rn/bcc-pkg
Add packages needed for iovisor/bcc
2018-07-12 11:06:35 +01:00
Rolf Neugebauer
59e04612b4 docs: Add update of test cases to release doc
While at it also improve the commit messages.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2018-07-12 10:38:32 +01:00
Rolf Neugebauer
1ebc8c0099 tests: Update linuxkit/alpine for tests as well.
I missed this during the recent updates.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2018-07-12 10:34:12 +01:00
Rolf Neugebauer
3beb03c684 tools/alpine: Update linuxkit/alpine
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@gmail.com>
2018-07-11 23:59:20 +00:00
Rolf Neugebauer
7d9457382c tools/alpine: Add packages needed for the iovisor/bcc tools
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@gmail.com>
2018-07-12 00:25:30 +01:00
Rolf Neugebauer
ecd412d087
Merge pull request #3109 from rn/log
Add '.log' as file extension to 'pkg/logwrite' files
2018-07-11 22:03:35 +01:00
Rolf Neugebauer
71b5dc8010 Update YAMLs to new logwrite package
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2018-07-11 19:17:01 +01:00
Rolf Neugebauer
83f3c58c50 examples: Use alpine:3.8 in logging example
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2018-07-11 15:55:28 +01:00
Rolf Neugebauer
d92ca6d6e4 tests: Adjust logging test to new .log extension
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2018-07-11 15:55:28 +01:00
Rolf Neugebauer
e8786d73bb pkg/logwrite: Append .log to the log files
Also simplify the code by directly storing the path to
the log file in the LogFile structure.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2018-07-11 15:55:27 +01:00
Rolf Neugebauer
90765efac5
Merge pull request #3107 from rn/typo
Fix typo in CHANGELOG
2018-07-11 13:27:23 +01:00
Rolf Neugebauer
77eafc5d6d Fix typo in CHANGELOG
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2018-07-11 10:26:02 +01:00
Rolf Neugebauer
fa3bbe3867
Merge pull request #3105 from rn/post_rev0.5
Bump version to v0.5+
2018-07-11 10:21:21 +01:00
Rolf Neugebauer
095bacc396 Bump version to v0.5+
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@gmail.com>
2018-07-11 00:00:10 +01:00
Rolf Neugebauer
811ba12cb0
Merge pull request #3104 from rn/rel_v0.5
Preparation for v0.5 release
2018-07-10 23:58:09 +01:00
Rolf Neugebauer
3181a8f182 Update Authors
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@gmail.com>
2018-07-10 18:46:57 +01:00
Rolf Neugebauer
3ab5e19b2f Update CHANGELOG
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@gmail.com>
2018-07-10 18:44:37 +01:00
Rolf Neugebauer
88afbcae15 build: Bump version to v0.5
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@gmail.com>
2018-07-10 18:32:57 +01:00
Rolf Neugebauer
ea9b29bd19 Update package tags to v0.5
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2018-07-10 18:16:02 +01:00