opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-07-03 09:17:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

do not commit default volumes from container

Browse Source 
when performing a container commit, we should not add the default list of volumes
for a container to the resulting image.  it will cause the resulting image to crash
when run subsequently.

Signed-off-by: baude <bbaude@redhat.com>

Closes: #699
Approved by: mheon
This commit is contained in:
baude
2018-04-30 08:26:31 -05:00
committed by Atomic Bot
parent c8c39779a7
commit 9924956dc8
3 changed files with 47 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libpod/container_commit.go
View File

@ -26,7 +26,7 @@ type ContainerCommitOptions struct {
// Commit commits the changes between a container and its image, creating a new
// image
func (c *Container) Commit(ctx context.Context, destImage string, options ContainerCommitOptions) (*image.Image, error) {
func (c *Container) Commit(ctx context.Context, destImage string, options ContainerCommitOptions, mounts, command, entryPoint []string) (*image.Image, error) {
if !c.batched {
c.lock.Lock()
defer c.lock.Unlock()
@ -74,11 +74,15 @@ func (c *Container) Commit(ctx context.Context, destImage string, options Contai
// add it to the resulting image.
// Entrypoint - always set this first or cmd will get wiped out
importBuilder.SetEntrypoint(c.Spec().Process.Args)
if len(entryPoint) > 0 {
importBuilder.SetEntrypoint(entryPoint)
}
// Cmd
// We cannot differentiate between cmd and entrypoint here
// so we assign args to both
importBuilder.SetCmd(c.Spec().Process.Args)
if len(command) > 0 {
importBuilder.SetCmd(command)
}
// Env
for _, e := range c.config.Spec.Process.Env {
splitEnv := strings.Split(e, "=")
@ -96,8 +100,10 @@ func (c *Container) Commit(ctx context.Context, destImage string, options Contai
// User
importBuilder.SetUser(c.User())
// Volumes
for _, v := range c.config.Spec.Mounts {
importBuilder.AddVolume(v.Source)
for _, v := range mounts {
if v != "" {
importBuilder.AddVolume(v)
}
}
// Workdir
importBuilder.SetWorkDir(c.Spec().Process.Cwd)