Browse code
Set default values for uid and gid to prevent errors when starting a service.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit 167b3f95b7f659817f8421742ca4078edd42dbaa)
Signed-off-by: Victor Vieux <vieux@docker.com>
Daniel Nephin authored on 2017/01/27 02:00:46Showing 1 changed files
| ... | ... |
@@ -211,11 +211,20 @@ func convertServiceSecrets( |
| 211 | 211 |
source = secretSpec.External.Name |
| 212 | 212 |
} |
| 213 | 213 |
|
| 214 |
+ uid := secret.UID |
|
| 215 |
+ gid := secret.GID |
|
| 216 |
+ if uid == "" {
|
|
| 217 |
+ uid = "0" |
|
| 218 |
+ } |
|
| 219 |
+ if gid == "" {
|
|
| 220 |
+ gid = "0" |
|
| 221 |
+ } |
|
| 222 |
+ |
|
| 214 | 223 |
opts = append(opts, &types.SecretRequestOption{
|
| 215 | 224 |
Source: source, |
| 216 | 225 |
Target: target, |
| 217 |
- UID: secret.UID, |
|
| 218 |
- GID: secret.GID, |
|
| 226 |
+ UID: uid, |
|
| 227 |
+ GID: gid, |
|
| 219 | 228 |
Mode: os.FileMode(secret.Mode), |
| 220 | 229 |
}) |
| 221 | 230 |
} |