image_commit.go 3.2 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122
  1. package images // import "github.com/docker/docker/daemon/images"
  2. import (
  3. "encoding/json"
  4. "io"
  5. "github.com/docker/docker/api/types/backend"
  6. "github.com/docker/docker/image"
  7. "github.com/docker/docker/layer"
  8. "github.com/docker/docker/pkg/ioutils"
  9. "github.com/pkg/errors"
  10. )
  11. // CommitImage creates a new image from a commit config
  12. func (i *ImageService) CommitImage(c backend.CommitConfig) (image.ID, error) {
  13. rwTar, err := exportContainerRw(i.layerStore, c.ContainerID, c.ContainerMountLabel)
  14. if err != nil {
  15. return "", err
  16. }
  17. defer func() {
  18. if rwTar != nil {
  19. rwTar.Close()
  20. }
  21. }()
  22. var parent *image.Image
  23. if c.ParentImageID == "" {
  24. parent = new(image.Image)
  25. parent.RootFS = image.NewRootFS()
  26. } else {
  27. parent, err = i.imageStore.Get(image.ID(c.ParentImageID))
  28. if err != nil {
  29. return "", err
  30. }
  31. }
  32. l, err := i.layerStore.Register(rwTar, parent.RootFS.ChainID())
  33. if err != nil {
  34. return "", err
  35. }
  36. defer layer.ReleaseAndLog(i.layerStore, l)
  37. cc := image.ChildConfig{
  38. ContainerID: c.ContainerID,
  39. Author: c.Author,
  40. Comment: c.Comment,
  41. ContainerConfig: c.ContainerConfig,
  42. Config: c.Config,
  43. DiffID: l.DiffID(),
  44. }
  45. config, err := json.Marshal(image.NewChildImage(parent, cc, c.ContainerOS))
  46. if err != nil {
  47. return "", err
  48. }
  49. id, err := i.imageStore.Create(config)
  50. if err != nil {
  51. return "", err
  52. }
  53. if c.ParentImageID != "" {
  54. if err := i.imageStore.SetParent(id, image.ID(c.ParentImageID)); err != nil {
  55. return "", err
  56. }
  57. }
  58. return id, nil
  59. }
  60. func exportContainerRw(layerStore layer.Store, id, mountLabel string) (arch io.ReadCloser, err error) {
  61. rwlayer, err := layerStore.GetRWLayer(id)
  62. if err != nil {
  63. return nil, err
  64. }
  65. defer func() {
  66. if err != nil {
  67. layerStore.ReleaseRWLayer(rwlayer)
  68. }
  69. }()
  70. // TODO: this mount call is not necessary as we assume that TarStream() should
  71. // mount the layer if needed. But the Diff() function for windows requests that
  72. // the layer should be mounted when calling it. So we reserve this mount call
  73. // until windows driver can implement Diff() interface correctly.
  74. _, err = rwlayer.Mount(mountLabel)
  75. if err != nil {
  76. return nil, err
  77. }
  78. archive, err := rwlayer.TarStream()
  79. if err != nil {
  80. rwlayer.Unmount()
  81. return nil, err
  82. }
  83. return ioutils.NewReadCloserWrapper(archive, func() error {
  84. archive.Close()
  85. err = rwlayer.Unmount()
  86. layerStore.ReleaseRWLayer(rwlayer)
  87. return err
  88. }),
  89. nil
  90. }
  91. // CommitBuildStep is used by the builder to create an image for each step in
  92. // the build.
  93. //
  94. // This method is different from CreateImageFromContainer:
  95. // - it doesn't attempt to validate container state
  96. // - it doesn't send a commit action to metrics
  97. // - it doesn't log a container commit event
  98. //
  99. // This is a temporary shim. Should be removed when builder stops using commit.
  100. func (i *ImageService) CommitBuildStep(c backend.CommitConfig) (image.ID, error) {
  101. container := i.containers.Get(c.ContainerID)
  102. if container == nil {
  103. // TODO: use typed error
  104. return "", errors.Errorf("container not found: %s", c.ContainerID)
  105. }
  106. c.ContainerMountLabel = container.MountLabel
  107. c.ContainerOS = container.OS
  108. c.ParentImageID = string(container.ImageID)
  109. return i.CommitImage(c)
  110. }