Merge pull request #195 from thaJeztah/18.09_backport_makefile_and_test_changes
[18.09 backport] Makefile and test changes
diff --git a/builder/builder-next/adapters/containerimage/pull.go b/builder/builder-next/adapters/containerimage/pull.go
index bb01b29..dfd5434 100644
--- a/builder/builder-next/adapters/containerimage/pull.go
+++ b/builder/builder-next/adapters/containerimage/pull.go
@@ -8,6 +8,7 @@
"io/ioutil"
"runtime"
"sync"
+ "sync/atomic"
"time"
"github.com/containerd/containerd/content"
@@ -57,13 +58,15 @@
type imageSource struct {
SourceOpt
- g flightcontrol.Group
+ g flightcontrol.Group
+ resolverCache *resolverCache
}
// NewSource creates a new image source
func NewSource(opt SourceOpt) (source.Source, error) {
is := &imageSource{
- SourceOpt: opt,
+ SourceOpt: opt,
+ resolverCache: newResolverCache(),
}
return is, nil
@@ -74,6 +77,9 @@
}
func (is *imageSource) getResolver(ctx context.Context, rfn resolver.ResolveOptionsFunc, ref string) remotes.Resolver {
+ if res := is.resolverCache.Get(ctx, ref); res != nil {
+ return res
+ }
opt := docker.ResolverOptions{
Client: tracing.DefaultClient,
}
@@ -82,6 +88,7 @@
}
opt.Credentials = is.getCredentialsFromSession(ctx)
r := docker.NewResolver(opt)
+ r = is.resolverCache.Add(ctx, ref, r)
return r
}
@@ -380,6 +387,11 @@
return nil, err
}
+ // workaround for GCR bug that requires a request to manifest endpoint for authentication to work.
+ // if current resolver has not used manifests do a dummy request.
+ // in most cases resolver should be cached and extra request is not needed.
+ ensureManifestRequested(ctx, p.resolver, p.ref)
+
var (
schema1Converter *schema1.Converter
handlers []images.Handler
@@ -791,3 +803,90 @@
}
return ""
}
+
+type resolverCache struct {
+ mu sync.Mutex
+ m map[string]cachedResolver
+}
+
+type cachedResolver struct {
+ timeout time.Time
+ remotes.Resolver
+ counter int64
+}
+
+func (cr *cachedResolver) Resolve(ctx context.Context, ref string) (name string, desc ocispec.Descriptor, err error) {
+ atomic.AddInt64(&cr.counter, 1)
+ return cr.Resolver.Resolve(ctx, ref)
+}
+
+func (r *resolverCache) Add(ctx context.Context, ref string, resolver remotes.Resolver) remotes.Resolver {
+ r.mu.Lock()
+ defer r.mu.Unlock()
+
+ ref = r.repo(ref) + "-" + session.FromContext(ctx)
+
+ cr, ok := r.m[ref]
+ cr.timeout = time.Now().Add(time.Minute)
+ if ok {
+ return &cr
+ }
+
+ cr.Resolver = resolver
+ r.m[ref] = cr
+ return &cr
+}
+
+func (r *resolverCache) repo(refStr string) string {
+ ref, err := distreference.ParseNormalizedNamed(refStr)
+ if err != nil {
+ return refStr
+ }
+ return ref.Name()
+}
+
+func (r *resolverCache) Get(ctx context.Context, ref string) remotes.Resolver {
+ r.mu.Lock()
+ defer r.mu.Unlock()
+
+ ref = r.repo(ref) + "-" + session.FromContext(ctx)
+
+ cr, ok := r.m[ref]
+ if !ok {
+ return nil
+ }
+ return &cr
+}
+
+func (r *resolverCache) clean(now time.Time) {
+ r.mu.Lock()
+ for k, cr := range r.m {
+ if now.After(cr.timeout) {
+ delete(r.m, k)
+ }
+ }
+ r.mu.Unlock()
+}
+
+func newResolverCache() *resolverCache {
+ rc := &resolverCache{
+ m: map[string]cachedResolver{},
+ }
+ t := time.NewTicker(time.Minute)
+ go func() {
+ for {
+ rc.clean(<-t.C)
+ }
+ }()
+ return rc
+}
+
+func ensureManifestRequested(ctx context.Context, res remotes.Resolver, ref string) {
+ cr, ok := res.(*cachedResolver)
+ if !ok {
+ return
+ }
+ if atomic.LoadInt64(&cr.counter) == 0 {
+ res.Resolve(ctx, ref)
+ }
+}
diff --git a/container/container_unix.go b/container/container_unix.go
index 6d402be..8419bd5 100644
--- a/container/container_unix.go
+++ b/container/container_unix.go
@@ -136,7 +136,7 @@
return err
}
- id := stringid.GenerateNonCryptoID()
+ id := stringid.GenerateRandomID()
path, err := v.Mount(id)
if err != nil {
return err
diff --git a/daemon/cluster/executor/container/container.go b/daemon/cluster/executor/container/container.go
index 77d21d2..6311fc8 100644
--- a/daemon/cluster/executor/container/container.go
+++ b/daemon/cluster/executor/container/container.go
@@ -6,7 +6,6 @@
"net"
"strconv"
"strings"
- "time"
"github.com/sirupsen/logrus"
@@ -31,10 +30,6 @@
)
const (
- // Explicitly use the kernel's default setting for CPU quota of 100ms.
- // https://www.kernel.org/doc/Documentation/scheduler/sched-bwc.txt
- cpuQuotaPeriod = 100 * time.Millisecond
-
// systemLabelPrefix represents the reserved namespace for system labels.
systemLabelPrefix = "com.docker.swarm"
)
@@ -448,9 +443,7 @@
}
if r.Limits.NanoCPUs > 0 {
- // CPU Period must be set in microseconds.
- resources.CPUPeriod = int64(cpuQuotaPeriod / time.Microsecond)
- resources.CPUQuota = r.Limits.NanoCPUs * resources.CPUPeriod / 1e9
+ resources.NanoCPUs = r.Limits.NanoCPUs
}
return resources
diff --git a/daemon/create_unix.go b/daemon/create_unix.go
index 13857ba..e78415a 100644
--- a/daemon/create_unix.go
+++ b/daemon/create_unix.go
@@ -41,7 +41,7 @@
}
for spec := range config.Volumes {
- name := stringid.GenerateNonCryptoID()
+ name := stringid.GenerateRandomID()
destination := filepath.Clean(spec)
// Skip volumes for which we already have something mounted on that
diff --git a/daemon/create_windows.go b/daemon/create_windows.go
index 37e425a..3bce278 100644
--- a/daemon/create_windows.go
+++ b/daemon/create_windows.go
@@ -38,7 +38,7 @@
// If the mountpoint doesn't have a name, generate one.
if len(mp.Name) == 0 {
- mp.Name = stringid.GenerateNonCryptoID()
+ mp.Name = stringid.GenerateRandomID()
}
// Skip volumes for which we already have something mounted on that
diff --git a/daemon/daemon.go b/daemon/daemon.go
index a307863..b2c02a9 100644
--- a/daemon/daemon.go
+++ b/daemon/daemon.go
@@ -11,6 +11,7 @@
"io/ioutil"
"math/rand"
"net"
+ "net/url"
"os"
"path"
"path/filepath"
@@ -157,15 +158,18 @@
)
// must trim "https://" or "http://" prefix
for i, v := range daemon.configStore.Mirrors {
- v = strings.TrimPrefix(v, "https://")
- v = strings.TrimPrefix(v, "http://")
+ if uri, err := url.Parse(v); err == nil {
+ v = uri.Host
+ }
mirrors[i] = v
}
// set "registry-mirrors"
m[registryKey] = resolver.RegistryConf{Mirrors: mirrors}
// set "insecure-registries"
for _, v := range daemon.configStore.InsecureRegistries {
- v = strings.TrimPrefix(v, "http://")
+ if uri, err := url.Parse(v); err == nil {
+ v = uri.Host
+ }
m[v] = resolver.RegistryConf{
PlainHTTP: true,
}
diff --git a/daemon/exec/exec.go b/daemon/exec/exec.go
index c036c46..cf2a955 100644
--- a/daemon/exec/exec.go
+++ b/daemon/exec/exec.go
@@ -39,7 +39,7 @@
// NewConfig initializes the a new exec configuration
func NewConfig() *Config {
return &Config{
- ID: stringid.GenerateNonCryptoID(),
+ ID: stringid.GenerateRandomID(),
StreamConfig: stream.NewConfig(),
Started: make(chan struct{}),
}
diff --git a/daemon/graphdriver/aufs/aufs_test.go b/daemon/graphdriver/aufs/aufs_test.go
index fdc502b..0752c84 100644
--- a/daemon/graphdriver/aufs/aufs_test.go
+++ b/daemon/graphdriver/aufs/aufs_test.go
@@ -731,7 +731,7 @@
// create a bunch of ids
var ids []string
for i := 0; i < numConcurrent; i++ {
- ids = append(ids, stringid.GenerateNonCryptoID())
+ ids = append(ids, stringid.GenerateRandomID())
}
if err := d.Create(ids[0], "", nil); err != nil {
diff --git a/daemon/logger/adapter.go b/daemon/logger/adapter.go
index d937035..97d59be 100644
--- a/daemon/logger/adapter.go
+++ b/daemon/logger/adapter.go
@@ -39,6 +39,13 @@
a.buf.TimeNano = msg.Timestamp.UnixNano()
a.buf.Partial = msg.PLogMetaData != nil
a.buf.Source = msg.Source
+ if msg.PLogMetaData != nil {
+ a.buf.PartialLogMetadata = &logdriver.PartialLogEntryMetadata{
+ Id: msg.PLogMetaData.ID,
+ Last: msg.PLogMetaData.Last,
+ Ordinal: int32(msg.PLogMetaData.Ordinal),
+ }
+ }
err := a.enc.Encode(&a.buf)
a.buf.Reset()
diff --git a/daemon/logger/plugin.go b/daemon/logger/plugin.go
index c66540c..8c155b0 100644
--- a/daemon/logger/plugin.go
+++ b/daemon/logger/plugin.go
@@ -81,7 +81,7 @@
return nil, err
}
- id := stringid.GenerateNonCryptoID()
+ id := stringid.GenerateRandomID()
a := &pluginAdapter{
driverName: name,
id: id,
diff --git a/daemon/names.go b/daemon/names.go
index 6c31949..4fa39af 100644
--- a/daemon/names.go
+++ b/daemon/names.go
@@ -38,7 +38,7 @@
func (daemon *Daemon) generateIDAndName(name string) (string, string, error) {
var (
err error
- id = stringid.GenerateNonCryptoID()
+ id = stringid.GenerateRandomID()
)
if name == "" {
diff --git a/integration-cli/docker_cli_external_volume_driver_unix_test.go b/integration-cli/docker_cli_external_volume_driver_unix_test.go
index b876d9f..e9e92d4 100644
--- a/integration-cli/docker_cli_external_volume_driver_unix_test.go
+++ b/integration-cli/docker_cli_external_volume_driver_unix_test.go
@@ -558,7 +558,7 @@
}
func (s *DockerExternalVolumeSuite) TestExternalVolumeDriverOutOfBandDelete(c *check.C) {
- driverName := stringid.GenerateNonCryptoID()
+ driverName := stringid.GenerateRandomID()
p := newVolumePlugin(c, driverName)
defer p.Close()
diff --git a/integration/container/rename_test.go b/integration/container/rename_test.go
index 25474a7..24bbe98 100644
--- a/integration/container/rename_test.go
+++ b/integration/container/rename_test.go
@@ -61,7 +61,7 @@
assert.NilError(t, err)
assert.Check(t, is.Equal("/"+oldName, inspect.Name))
- newName := "new_name" + stringid.GenerateNonCryptoID()
+ newName := "new_name" + stringid.GenerateRandomID()
err = client.ContainerRename(ctx, oldName, newName)
assert.NilError(t, err)
@@ -79,7 +79,7 @@
cID := container.Run(t, ctx, client, container.WithName(oldName))
poll.WaitOn(t, container.IsInState(ctx, client, cID, "running"), poll.WithDelay(100*time.Millisecond))
- newName := "new_name" + stringid.GenerateNonCryptoID()
+ newName := "new_name" + stringid.GenerateRandomID()
err := client.ContainerRename(ctx, oldName, newName)
assert.NilError(t, err)
diff --git a/pkg/idtools/idtools.go b/pkg/idtools/idtools.go
index 230422e..b3af7a4 100644
--- a/pkg/idtools/idtools.go
+++ b/pkg/idtools/idtools.go
@@ -4,7 +4,6 @@
"bufio"
"fmt"
"os"
- "sort"
"strconv"
"strings"
)
@@ -203,8 +202,6 @@
func createIDMap(subidRanges ranges) []IDMap {
idMap := []IDMap{}
- // sort the ranges by lowest ID first
- sort.Sort(subidRanges)
containerID := 0
for _, idrange := range subidRanges {
idMap = append(idMap, IDMap{
diff --git a/pkg/idtools/idtools_test.go b/pkg/idtools/idtools_test.go
new file mode 100644
index 0000000..7627d19
--- /dev/null
+++ b/pkg/idtools/idtools_test.go
@@ -0,0 +1,28 @@
+package idtools // import "github.com/docker/docker/pkg/idtools"
+
+import (
+ "testing"
+
+ "gotest.tools/assert"
+)
+
+func TestCreateIDMapOrder(t *testing.T) {
+ subidRanges := ranges{
+ {100000, 1000},
+ {1000, 1},
+ }
+
+ idMap := createIDMap(subidRanges)
+ assert.DeepEqual(t, idMap, []IDMap{
+ {
+ ContainerID: 0,
+ HostID: 100000,
+ Size: 1000,
+ },
+ {
+ ContainerID: 1000,
+ HostID: 1000,
+ Size: 1,
+ },
+ })
+}
diff --git a/pkg/stringid/stringid.go b/pkg/stringid/stringid.go
index fa7d916..5fe071d 100644
--- a/pkg/stringid/stringid.go
+++ b/pkg/stringid/stringid.go
@@ -2,17 +2,12 @@
package stringid // import "github.com/docker/docker/pkg/stringid"
import (
- cryptorand "crypto/rand"
+ "crypto/rand"
"encoding/hex"
"fmt"
- "io"
- "math"
- "math/big"
- "math/rand"
"regexp"
"strconv"
"strings"
- "time"
)
const shortLen = 12
@@ -41,10 +36,11 @@
return id
}
-func generateID(r io.Reader) string {
+// GenerateRandomID returns a unique id.
+func GenerateRandomID() string {
b := make([]byte, 32)
for {
- if _, err := io.ReadFull(r, b); err != nil {
+ if _, err := rand.Read(b); err != nil {
panic(err) // This shouldn't happen
}
id := hex.EncodeToString(b)
@@ -58,18 +54,6 @@
}
}
-// GenerateRandomID returns a unique id.
-func GenerateRandomID() string {
- return generateID(cryptorand.Reader)
-}
-
-// GenerateNonCryptoID generates unique id without using cryptographically
-// secure sources of random.
-// It helps you to save entropy.
-func GenerateNonCryptoID() string {
- return generateID(readerFunc(rand.Read))
-}
-
// ValidateID checks whether an ID string is a valid image ID.
func ValidateID(id string) error {
if ok := validHex.MatchString(id); !ok {
@@ -77,23 +61,3 @@
}
return nil
}
-
-func init() {
- // safely set the seed globally so we generate random ids. Tries to use a
- // crypto seed before falling back to time.
- var seed int64
- if cryptoseed, err := cryptorand.Int(cryptorand.Reader, big.NewInt(math.MaxInt64)); err != nil {
- // This should not happen, but worst-case fallback to time-based seed.
- seed = time.Now().UnixNano()
- } else {
- seed = cryptoseed.Int64()
- }
-
- rand.Seed(seed)
-}
-
-type readerFunc func(p []byte) (int, error)
-
-func (fn readerFunc) Read(p []byte) (int, error) {
- return fn(p)
-}
diff --git a/pkg/stringid/stringid_test.go b/pkg/stringid/stringid_test.go
index a7ccd5f..2660d2e 100644
--- a/pkg/stringid/stringid_test.go
+++ b/pkg/stringid/stringid_test.go
@@ -13,14 +13,6 @@
}
}
-func TestGenerateNonCryptoID(t *testing.T) {
- id := GenerateNonCryptoID()
-
- if len(id) != 64 {
- t.Fatalf("Id returned is incorrect: %s", id)
- }
-}
-
func TestShortenId(t *testing.T) {
id := "90435eec5c4e124e741ef731e118be2fc799a68aba0466ec17717f24ce2ae6a2"
truncID := TruncateID(id)
diff --git a/pkg/truncindex/truncindex_test.go b/pkg/truncindex/truncindex_test.go
index e259017..6d00a24 100644
--- a/pkg/truncindex/truncindex_test.go
+++ b/pkg/truncindex/truncindex_test.go
@@ -158,7 +158,7 @@
func BenchmarkTruncIndexAdd100(b *testing.B) {
var testSet []string
for i := 0; i < 100; i++ {
- testSet = append(testSet, stringid.GenerateNonCryptoID())
+ testSet = append(testSet, stringid.GenerateRandomID())
}
b.ResetTimer()
for i := 0; i < b.N; i++ {
@@ -174,7 +174,7 @@
func BenchmarkTruncIndexAdd250(b *testing.B) {
var testSet []string
for i := 0; i < 250; i++ {
- testSet = append(testSet, stringid.GenerateNonCryptoID())
+ testSet = append(testSet, stringid.GenerateRandomID())
}
b.ResetTimer()
for i := 0; i < b.N; i++ {
@@ -190,7 +190,7 @@
func BenchmarkTruncIndexAdd500(b *testing.B) {
var testSet []string
for i := 0; i < 500; i++ {
- testSet = append(testSet, stringid.GenerateNonCryptoID())
+ testSet = append(testSet, stringid.GenerateRandomID())
}
b.ResetTimer()
for i := 0; i < b.N; i++ {
@@ -207,7 +207,7 @@
var testSet []string
var testKeys []string
for i := 0; i < 100; i++ {
- testSet = append(testSet, stringid.GenerateNonCryptoID())
+ testSet = append(testSet, stringid.GenerateRandomID())
}
index := NewTruncIndex([]string{})
for _, id := range testSet {
@@ -231,7 +231,7 @@
var testSet []string
var testKeys []string
for i := 0; i < 250; i++ {
- testSet = append(testSet, stringid.GenerateNonCryptoID())
+ testSet = append(testSet, stringid.GenerateRandomID())
}
index := NewTruncIndex([]string{})
for _, id := range testSet {
@@ -255,7 +255,7 @@
var testSet []string
var testKeys []string
for i := 0; i < 500; i++ {
- testSet = append(testSet, stringid.GenerateNonCryptoID())
+ testSet = append(testSet, stringid.GenerateRandomID())
}
index := NewTruncIndex([]string{})
for _, id := range testSet {
@@ -278,7 +278,7 @@
func BenchmarkTruncIndexDelete100(b *testing.B) {
var testSet []string
for i := 0; i < 100; i++ {
- testSet = append(testSet, stringid.GenerateNonCryptoID())
+ testSet = append(testSet, stringid.GenerateRandomID())
}
b.ResetTimer()
for i := 0; i < b.N; i++ {
@@ -301,7 +301,7 @@
func BenchmarkTruncIndexDelete250(b *testing.B) {
var testSet []string
for i := 0; i < 250; i++ {
- testSet = append(testSet, stringid.GenerateNonCryptoID())
+ testSet = append(testSet, stringid.GenerateRandomID())
}
b.ResetTimer()
for i := 0; i < b.N; i++ {
@@ -324,7 +324,7 @@
func BenchmarkTruncIndexDelete500(b *testing.B) {
var testSet []string
for i := 0; i < 500; i++ {
- testSet = append(testSet, stringid.GenerateNonCryptoID())
+ testSet = append(testSet, stringid.GenerateRandomID())
}
b.ResetTimer()
for i := 0; i < b.N; i++ {
@@ -347,7 +347,7 @@
func BenchmarkTruncIndexNew100(b *testing.B) {
var testSet []string
for i := 0; i < 100; i++ {
- testSet = append(testSet, stringid.GenerateNonCryptoID())
+ testSet = append(testSet, stringid.GenerateRandomID())
}
b.ResetTimer()
for i := 0; i < b.N; i++ {
@@ -358,7 +358,7 @@
func BenchmarkTruncIndexNew250(b *testing.B) {
var testSet []string
for i := 0; i < 250; i++ {
- testSet = append(testSet, stringid.GenerateNonCryptoID())
+ testSet = append(testSet, stringid.GenerateRandomID())
}
b.ResetTimer()
for i := 0; i < b.N; i++ {
@@ -369,7 +369,7 @@
func BenchmarkTruncIndexNew500(b *testing.B) {
var testSet []string
for i := 0; i < 500; i++ {
- testSet = append(testSet, stringid.GenerateNonCryptoID())
+ testSet = append(testSet, stringid.GenerateRandomID())
}
b.ResetTimer()
for i := 0; i < b.N; i++ {
@@ -381,7 +381,7 @@
var testSet []string
var testKeys []string
for i := 0; i < 500; i++ {
- id := stringid.GenerateNonCryptoID()
+ id := stringid.GenerateRandomID()
testSet = append(testSet, id)
l := rand.Intn(12) + 12
testKeys = append(testKeys, id[:l])
@@ -406,7 +406,7 @@
var testSet []string
var testKeys []string
for i := 0; i < 500; i++ {
- id := stringid.GenerateNonCryptoID()
+ id := stringid.GenerateRandomID()
testSet = append(testSet, id)
l := rand.Intn(12) + 12
testKeys = append(testKeys, id[:l])
@@ -431,7 +431,7 @@
var testSet []string
var testKeys []string
for i := 0; i < 500; i++ {
- id := stringid.GenerateNonCryptoID()
+ id := stringid.GenerateRandomID()
testSet = append(testSet, id)
l := rand.Intn(12) + 12
testKeys = append(testKeys, id[:l])
diff --git a/plugin/manager_linux_test.go b/plugin/manager_linux_test.go
index fd8fa85..1b6a3bf 100644
--- a/plugin/manager_linux_test.go
+++ b/plugin/manager_linux_test.go
@@ -70,7 +70,7 @@
}
func newTestPlugin(t *testing.T, name, cap, root string) *v2.Plugin {
- id := stringid.GenerateNonCryptoID()
+ id := stringid.GenerateRandomID()
rootfs := filepath.Join(root, id)
if err := os.MkdirAll(rootfs, 0755); err != nil {
t.Fatal(err)
diff --git a/vendor.conf b/vendor.conf
index 95def4b..c508c5f 100644
--- a/vendor.conf
+++ b/vendor.conf
@@ -121,7 +121,7 @@
github.com/containerd/containerd 9754871865f7fe2f4e74d43e2fc7ccd237edcbce # v1.2.2
github.com/containerd/fifo 3d5202aec260678c48179c56f40e6f38a095738c
github.com/containerd/continuity 004b46473808b3e7a4a3049c20e4376c91eb966d
-github.com/containerd/cgroups dbea6f2bd41658b84b00417ceefa416b979cbf10
+github.com/containerd/cgroups 4994991857f9b0ae8dc439551e8bebdbb4bf66c1
github.com/containerd/console c12b1e7919c14469339a5d38f2f8ed9b64a9de23
github.com/containerd/cri 0d5cabd006cb5319dc965046067b8432d9fa5ef8 # release/1.2 branch
github.com/containerd/go-runc 5a6d9f37cfa36b15efba46dc7ea349fa9b7143c3
diff --git a/vendor/github.com/containerd/cgroups/cgroup.go b/vendor/github.com/containerd/cgroups/cgroup.go
index 9fbea82..e3ef076 100644
--- a/vendor/github.com/containerd/cgroups/cgroup.go
+++ b/vendor/github.com/containerd/cgroups/cgroup.go
@@ -105,6 +105,10 @@
}
activeSubsystems = append(activeSubsystems, s)
}
+ // if we do not have any active systems then the cgroup is deleted
+ if len(activeSubsystems) == 0 {
+ return nil, ErrCgroupDeleted
+ }
return &cgroup{
path: path,
subsystems: activeSubsystems,
diff --git a/volume/mounts/linux_parser.go b/volume/mounts/linux_parser.go
index e276a39..22ba747 100644
--- a/volume/mounts/linux_parser.go
+++ b/volume/mounts/linux_parser.go
@@ -295,7 +295,7 @@
switch cfg.Type {
case mount.TypeVolume:
if cfg.Source == "" {
- mp.Name = stringid.GenerateNonCryptoID()
+ mp.Name = stringid.GenerateRandomID()
} else {
mp.Name = cfg.Source
}
diff --git a/volume/mounts/mounts.go b/volume/mounts/mounts.go
index 63a1406..5bf169f 100644
--- a/volume/mounts/mounts.go
+++ b/volume/mounts/mounts.go
@@ -125,7 +125,7 @@
if m.Volume != nil {
id := m.ID
if id == "" {
- id = stringid.GenerateNonCryptoID()
+ id = stringid.GenerateRandomID()
}
path, err := m.Volume.Mount(id)
if err != nil {
diff --git a/volume/mounts/windows_parser.go b/volume/mounts/windows_parser.go
index ac61044..8f427d8 100644
--- a/volume/mounts/windows_parser.go
+++ b/volume/mounts/windows_parser.go
@@ -385,7 +385,7 @@
switch cfg.Type {
case mount.TypeVolume:
if cfg.Source == "" {
- mp.Name = stringid.GenerateNonCryptoID()
+ mp.Name = stringid.GenerateRandomID()
} else {
mp.Name = cfg.Source
}
diff --git a/volume/service/service.go b/volume/service/service.go
index ebb5e20..f1fe5e7 100644
--- a/volume/service/service.go
+++ b/volume/service/service.go
@@ -56,7 +56,7 @@
// Create creates a volume
func (s *VolumesService) Create(ctx context.Context, name, driverName string, opts ...opts.CreateOption) (*types.Volume, error) {
if name == "" {
- name = stringid.GenerateNonCryptoID()
+ name = stringid.GenerateRandomID()
}
v, err := s.vs.Create(ctx, name, driverName, opts...)
if err != nil {
