From 415bdd396c804ac517056f121829171d9e5b2933 Mon Sep 17 00:00:00 2001
From: Ian Campbell <ian.campbell@docker.com>
Date: Wed, 28 Jun 2017 12:57:02 +0100
Subject: [PATCH] swarmd: Use common package.mk to simplify Makefile

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
---
 projects/swarmd/swarmd/Makefile | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/projects/swarmd/swarmd/Makefile b/projects/swarmd/swarmd/Makefile
index 13ae4dd66..b8e0bb5f7 100644
--- a/projects/swarmd/swarmd/Makefile
+++ b/projects/swarmd/swarmd/Makefile
@@ -1,15 +1,4 @@
-.PHONY: tag push
-all: push
-
-ORG?=linuxkit
 IMAGE=swarmd
+NETWORK=1
 
-HASH?=$(shell git ls-tree HEAD -- ../$(notdir $(CURDIR)) | awk '{print $$3}')
-
-default: push
-
-tag: Dockerfile
-	docker build --no-cache -t $(ORG)/$(IMAGE):$(HASH) .
-
-push: tag
-	docker pull $(ORG)/$(IMAGE):$(HASH) || docker push $(ORG)/$(IMAGE):$(HASH)
+include ../../../pkg/package.mk