ef7ab7bde8
The configDir (and "DOCKER_CONFIG" environment variable) is now only used for the default location for TLS certificates to secure the daemon API. It is a leftover from when the "docker" and "dockerd" CLI shared the same binary, allowing the DOCKER_CONFIG environment variable to set the location for certificates to be used by both. This patch merges it into cmd/dockerd, which is where it was used. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
39 lines
1.2 KiB
Go
39 lines
1.2 KiB
Go
package main
|
|
|
|
import (
|
|
"path/filepath"
|
|
"testing"
|
|
|
|
"github.com/docker/docker/daemon/config"
|
|
"github.com/spf13/pflag"
|
|
"gotest.tools/v3/assert"
|
|
is "gotest.tools/v3/assert/cmp"
|
|
)
|
|
|
|
func TestCommonOptionsInstallFlags(t *testing.T) {
|
|
flags := pflag.NewFlagSet("testing", pflag.ContinueOnError)
|
|
opts := newDaemonOptions(&config.Config{})
|
|
opts.installFlags(flags)
|
|
|
|
err := flags.Parse([]string{
|
|
"--tlscacert=/foo/cafile",
|
|
"--tlscert=/foo/cert",
|
|
"--tlskey=/foo/key",
|
|
})
|
|
assert.Check(t, err)
|
|
assert.Check(t, is.Equal("/foo/cafile", opts.TLSOptions.CAFile))
|
|
assert.Check(t, is.Equal("/foo/cert", opts.TLSOptions.CertFile))
|
|
assert.Check(t, is.Equal(opts.TLSOptions.KeyFile, "/foo/key"))
|
|
}
|
|
|
|
func TestCommonOptionsInstallFlagsWithDefaults(t *testing.T) {
|
|
flags := pflag.NewFlagSet("testing", pflag.ContinueOnError)
|
|
opts := newDaemonOptions(&config.Config{})
|
|
opts.installFlags(flags)
|
|
|
|
err := flags.Parse([]string{})
|
|
assert.Check(t, err)
|
|
assert.Check(t, is.Equal(filepath.Join(defaultCertPath(), "ca.pem"), opts.TLSOptions.CAFile))
|
|
assert.Check(t, is.Equal(filepath.Join(defaultCertPath(), "cert.pem"), opts.TLSOptions.CertFile))
|
|
assert.Check(t, is.Equal(filepath.Join(defaultCertPath(), "key.pem"), opts.TLSOptions.KeyFile))
|
|
}
|