From 7886e61e3dfb83a2c7b1dd339c08d7fecc5245f6 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Mon, 17 Jul 2017 15:58:11 +0100 Subject: [PATCH] Update moby to support metadata Add the yaml config to the default `linuxkit.yml`. You can check this with `cat /proc/1/root/etc/linuxkit-config`. Signed-off-by: Justin Cormack --- Makefile | 2 +- linuxkit.yml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 2fe8c69c3..7eeeee63a 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ endif PREFIX?=/usr/local/ -MOBY_COMMIT=a824287800b1871fde9859f5b2bd9009eaefa990 +MOBY_COMMIT=4105b7ea313b04bfd930aa45b8a091e8e3a1b2ac MOBY_VERSION=0.0 bin/moby: tmp_moby_bin.tar | bin tar xf $< diff --git a/linuxkit.yml b/linuxkit.yml index 92807d93c..f03d62e0a 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -49,6 +49,8 @@ files: [metrics] address = ":13337" + - path: etc/linuxkit-config + metadata: yaml trust: org: - linuxkit