Skip to content

Commit

Permalink
Initialize volumes when container is created
Browse files Browse the repository at this point in the history
Fixes moby#8942
Current behavior is that volumes aren't initialized until start.
Volumes still need to be initialized on start since VolumesFrom and
Binds can be passed in as part of HostConfig on start, however anything
that's already been initialized will just be skipped as is the current
behavior.

Signed-off-by: Brian Goff <[email protected]>
  • Loading branch information
cpuguy83 committed Nov 14, 2014
1 parent 2a517fe commit 7107898
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 0 deletions.
7 changes: 7 additions & 0 deletions daemon/create.go
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,13 @@ func (daemon *Daemon) Create(config *runconfig.Config, hostConfig *runconfig.Hos
return nil, nil, err
}
}
if err := container.Mount(); err != nil {
return nil, nil, err
}
defer container.Unmount()
if err := container.prepareVolumes(); err != nil {
return nil, nil, err
}
if err := container.ToDisk(); err != nil {
return nil, nil, err
}
Expand Down
3 changes: 3 additions & 0 deletions docs/sources/reference/api/docker_remote_api.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@ total memory available (`MemTotal`).
**New!**
You can set the new container's MAC address explicitly.

**New!**
Volumes are now initialized when the container is created.

`POST /containers/(id)/start`

**New!**
Expand Down
19 changes: 19 additions & 0 deletions integration-cli/docker_cli_create_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package main

import (
"encoding/json"
"os"
"os/exec"
"testing"
"time"
Expand Down Expand Up @@ -125,3 +126,21 @@ func TestCreateEchoStdout(t *testing.T) {

logDone("create - echo test123")
}

func TestCreateVolumesCreated(t *testing.T) {
name := "test_create_volume"
cmd(t, "create", "--name", name, "-v", "/foo", "busybox")
dir, err := inspectFieldMap(name, "Volumes", "/foo")
if err != nil {
t.Fatalf("Error getting volume host path: %q", err)
}

if _, err := os.Stat(dir); err != nil && os.IsNotExist(err) {
t.Fatalf("Volume was not created")
}
if err != nil {
t.Fatalf("Error statting volume host path: %q", err)
}

logDone("create - volumes are created")
}

0 comments on commit 7107898

Please sign in to comment.