drop the Compose.Image field

Everything that this field contained can be computed in another way:

- path: just lookup the local target and read the path from there
- mime: can be derived from distribution and compose output type
- size: can be derived from the path

Therefore it imho doesn't make much sense to store these information multiple
times.
This commit is contained in:
Ondřej Budai 2020-02-12 14:54:01 +01:00 committed by Tom Gundersen
parent a9633d29e9
commit cc00e0cdc9
6 changed files with 68 additions and 66 deletions

View file

@ -683,7 +683,7 @@ func (s *Store) PopJob() Job {
}
// UpdateImageBuildInCompose sets the status and optionally also the final image.
func (s *Store) UpdateImageBuildInCompose(composeID uuid.UUID, imageBuildID int, status common.ImageBuildState, image *compose.Image, result *common.ComposeResult) error {
func (s *Store) UpdateImageBuildInCompose(composeID uuid.UUID, imageBuildID int, status common.ImageBuildState, result *common.ComposeResult) error {
return s.change(func() error {
// Check that the compose exists
currentCompose, exists := s.Composes[composeID]
@ -717,9 +717,6 @@ func (s *Store) UpdateImageBuildInCompose(composeID uuid.UUID, imageBuildID int,
// In case the image build is done, store the time and possibly also the image
if status == common.IBFinished || status == common.IBFailed {
currentCompose.ImageBuilds[imageBuildID].JobFinished = time.Now()
if status == common.IBFinished {
currentCompose.ImageBuilds[imageBuildID].Image = image
}
}
s.Composes[composeID] = currentCompose