From cdd27f77589a95e6d58a243924e95b7d38fe8dc4 Mon Sep 17 00:00:00 2001
From: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Date: Fri, 26 May 2017 14:50:49 -0700
Subject: [PATCH] Update other ymls with linuxkit org after signing off on all
 packages

Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
---
 examples/docker.yml        | 16 ++--------------
 examples/node_exporter.yml |  9 ++-------
 examples/swap.yml          | 13 ++-----------
 pkg/docker-ce/Makefile     |  4 ++--
 pkg/mkimage/Makefile       |  4 ++--
 pkg/node_exporter/Makefile |  4 ++--
 pkg/open-vm-tools/Makefile |  4 ++--
 pkg/swap/Makefile          |  4 ++--
 8 files changed, 16 insertions(+), 42 deletions(-)

diff --git a/examples/docker.yml b/examples/docker.yml
index de4f28f87..52b686d2e 100644
--- a/examples/docker.yml
+++ b/examples/docker.yml
@@ -40,17 +40,5 @@ files:
   - path: etc/docker/daemon.json
     contents: '{"debug": true}'
 trust:
-  image:
-    - linuxkit/kernel
-    - linuxkit/init
-    - linuxkit/runc
-    - linuxkit/containerd
-    - linuxkit/ca-certificates
-    - linuxkit/sysctl
-    - linuxkit/sysfs
-    - linuxkit/binfmt
-    - linuxkit/format
-    - linuxkit/mount
-    - linuxkit/rngd
-    - linuxkit/dhcpcd
-    - linuxkit/openntpd
+  org:
+    - linuxkit
diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml
index 8402f9e85..7d2e06c55 100644
--- a/examples/node_exporter.yml
+++ b/examples/node_exporter.yml
@@ -13,10 +13,5 @@ services:
   - name: node_exporter
     image: "linuxkit/node_exporter:29a85e9c5de1a1bd470a963878194303f6a7bd8c"
 trust:
-  image:
-    - linuxkit/kernel
-    - linuxkit/init
-    - linuxkit/runc
-    - linuxkit/containerd
-    - linuxkit/rngd
-    - linuxkit/dhcpcd
+  org:
+    - linuxkit
diff --git a/examples/swap.yml b/examples/swap.yml
index 9673e640d..8fab3b666 100644
--- a/examples/swap.yml
+++ b/examples/swap.yml
@@ -35,14 +35,5 @@ services:
      - CAP_DAC_OVERRIDE
     net: host
 trust:
-  image:
-    - linuxkit/kernel
-    - linuxkit/init
-    - linuxkit/runc
-    - linuxkit/containerd
-    - linuxkit/ca-certificates
-    - linuxkit/sysctl
-    - linuxkit/dhcpcd
-    - linuxkit/format
-    - linuxkit/mount
-    - linuxkit/rngd
+  org:
+    - linuxkit
diff --git a/pkg/docker-ce/Makefile b/pkg/docker-ce/Makefile
index 02c9c272e..84499a10f 100644
--- a/pkg/docker-ce/Makefile
+++ b/pkg/docker-ce/Makefile
@@ -11,5 +11,5 @@ tag: $(DEPS)
 	docker build --squash --no-cache -t $(ORG)/$(IMAGE):$(HASH) .
 
 push: tag
-	docker pull $(ORG)/$(IMAGE):$(HASH) || \
-	docker push $(ORG)/$(IMAGE):$(HASH)
+	DOCKER_CONTENT_TRUST=1 docker pull $(ORG)/$(IMAGE):$(HASH) || \
+	DOCKER_CONTENT_TRUST=1 docker push $(ORG)/$(IMAGE):$(HASH)
diff --git a/pkg/mkimage/Makefile b/pkg/mkimage/Makefile
index 26931a984..c6be6905c 100644
--- a/pkg/mkimage/Makefile
+++ b/pkg/mkimage/Makefile
@@ -11,5 +11,5 @@ tag: $(DEPS)
 	docker build --no-cache --network=none -t $(ORG)/$(IMAGE):$(HASH) .
 
 push: tag
-	docker pull $(ORG)/$(IMAGE):$(HASH) || \
-	docker push $(ORG)/$(IMAGE):$(HASH)
+	DOCKER_CONTENT_TRUST=1 docker pull $(ORG)/$(IMAGE):$(HASH) || \
+	DOCKER_CONTENT_TRUST=1 docker push $(ORG)/$(IMAGE):$(HASH)
diff --git a/pkg/node_exporter/Makefile b/pkg/node_exporter/Makefile
index 467d7dc0d..137c58fb7 100644
--- a/pkg/node_exporter/Makefile
+++ b/pkg/node_exporter/Makefile
@@ -11,5 +11,5 @@ tag: $(DEPS)
 	docker build --no-cache --network=none -t $(ORG)/$(IMAGE):$(HASH) .
 
 push: tag
-	docker pull $(ORG)/$(IMAGE):$(HASH) || \
-	docker push $(ORG)/$(IMAGE):$(HASH)
+	DOCKER_CONTENT_TRUST=1 docker pull $(ORG)/$(IMAGE):$(HASH) || \
+	DOCKER_CONTENT_TRUST=1 docker push $(ORG)/$(IMAGE):$(HASH)
diff --git a/pkg/open-vm-tools/Makefile b/pkg/open-vm-tools/Makefile
index b3ba37448..d0108b63e 100644
--- a/pkg/open-vm-tools/Makefile
+++ b/pkg/open-vm-tools/Makefile
@@ -11,5 +11,5 @@ tag: $(DEPS)
 	docker build --squash --no-cache --network=none -t $(ORG)/$(IMAGE):$(HASH) .
 
 push: tag
-	docker pull $(ORG)/$(IMAGE):$(HASH) || \
-	docker push $(ORG)/$(IMAGE):$(HASH)
+	DOCKER_CONTENT_TRUST=1 docker pull $(ORG)/$(IMAGE):$(HASH) || \
+	DOCKER_CONTENT_TRUST=1 docker push $(ORG)/$(IMAGE):$(HASH)
diff --git a/pkg/swap/Makefile b/pkg/swap/Makefile
index 1e9783a81..558acbf9d 100644
--- a/pkg/swap/Makefile
+++ b/pkg/swap/Makefile
@@ -11,5 +11,5 @@ tag: $(DEPS)
 	docker build --squash --no-cache --network=none -t $(ORG)/$(IMAGE):$(HASH) .
 
 push: tag
-	docker pull $(ORG)/$(IMAGE):$(HASH) || \
-	docker push $(ORG)/$(IMAGE):$(HASH)
+	DOCKER_CONTENT_TRUST=1 docker pull $(ORG)/$(IMAGE):$(HASH) || \
+	DOCKER_CONTENT_TRUST=1 docker push $(ORG)/$(IMAGE):$(HASH)