From b4ed9a1ae0d5ae6e5ea53572ae6c4abe65b38332 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Thu, 26 Jan 2017 12:00:46 -0500
Subject: [PATCH] Set default values for uid and gid to prevent errors when
 starting a service.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 485a2b2b2fd11c93853fdedbf8434e3c6868dda2
Component: cli
---
 components/cli/compose/convert/service.go | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/components/cli/compose/convert/service.go b/components/cli/compose/convert/service.go
index 573f7723fd..f23df26127 100644
--- a/components/cli/compose/convert/service.go
+++ b/components/cli/compose/convert/service.go
@@ -196,11 +196,20 @@ func convertServiceSecrets(
 			source = secretSpec.External.Name
 		}
 
+		uid := secret.UID
+		gid := secret.GID
+		if uid == "" {
+			uid = "0"
+		}
+		if gid == "" {
+			gid = "0"
+		}
+
 		opts = append(opts, &types.SecretRequestOption{
 			Source: source,
 			Target: target,
-			UID:    secret.UID,
-			GID:    secret.GID,
+			UID:    uid,
+			GID:    gid,
 			Mode:   os.FileMode(secret.Mode),
 		})
 	}