diff options
| author | Brian Goff <cpuguy83@gmail.com> | 2018-01-17 10:49:58 -0500 |
|---|---|---|
| committer | Brian Goff <cpuguy83@gmail.com> | 2018-02-16 11:25:14 -0500 |
| commit | c02171802b788fb2d4d48bebcee2a57c8eabeeaa (patch) | |
| tree | 2b69ab319520c703af208aff39f6cc4c2b8518d3 /daemon/configs.go | |
| parent | 8e8f5f4457d8e1b02031576dbc18c903be4bcfb6 (diff) | |
| download | docker-c02171802b788fb2d4d48bebcee2a57c8eabeeaa.tar.gz | |
Merge configs/secrets in unix implementation
On unix, merge secrets/configs handling. This is important because
configs can contain secrets (via templating) and potentially a config
could just simply have secret information "by accident" from the user.
This just make sure that configs are as secure as secrets and de-dups a
lot of code.
Generally this makes everything simpler and configs more secure.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Diffstat (limited to 'daemon/configs.go')
| -rw-r--r-- | daemon/configs.go | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/daemon/configs.go b/daemon/configs.go index c19b7ff3fd..4fd0d2272c 100644 --- a/daemon/configs.go +++ b/daemon/configs.go @@ -2,7 +2,6 @@ package daemon // import "github.com/docker/docker/daemon" import ( swarmtypes "github.com/docker/docker/api/types/swarm" - "github.com/docker/docker/container" "github.com/sirupsen/logrus" ) @@ -17,10 +16,6 @@ func (daemon *Daemon) SetContainerConfigReferences(name string, refs []*swarmtyp if err != nil { return err } - - for _, ref := range refs { - c.ConfigReferences = append(c.ConfigReferences, &container.ConfigReference{ConfigReference: ref}) - } - + c.ConfigReferences = append(c.ConfigReferences, refs...) return nil } |