tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-23 21:54:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

align coding-style with network labels

Browse Source 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
This commit is contained in:
Nicolas De Loof 2020-11-27 10:31:10 +01:00
parent 49e653f142
commit 3ff6923d2e
No known key found for this signature in database
GPG Key ID: 9858809D6F8F6E7E
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
local/compose.go
View File

@ -73,7 +73,10 @@ func (s *composeService) Up(ctx context.Context, project *types.Project, detach
volume.Name = fmt.Sprintf("%s_%s", project.Name, k) volume.Name = fmt.Sprintf("%s_%s", project.Name, k)
project.Volumes[k] = volume project.Volumes[k] = volume
} }
err := s.ensureVolume(ctx, project, volume) volume.Labels = volume.Labels.Add(volumeLabel, k)
volume.Labels = volume.Labels.Add(projectLabel, project.Name)
volume.Labels = volume.Labels.Add(versionLabel, ComposeVersion)
err := s.ensureVolume(ctx, volume)
if err != nil { if err != nil {
return err return err
} }
@ -591,17 +594,10 @@ func (s *composeService) ensureNetwork(ctx context.Context, n types.NetworkConfi
return nil return nil
} }
func (s *composeService) ensureVolume(ctx context.Context, project *types.Project, volume types.VolumeConfig) error { func (s *composeService) ensureVolume(ctx context.Context, volume types.VolumeConfig) error {
// TODO could identify volume by label vs name // TODO could identify volume by label vs name
_, err := s.apiClient.VolumeInspect(ctx, volume.Name) _, err := s.apiClient.VolumeInspect(ctx, volume.Name)
if err != nil { if err != nil {
labels := volume.Labels
if labels == nil {
labels = map[string]string{}
}
labels[projectLabel] = project.Name
labels[volumeLabel] = volume.Name
if errdefs.IsNotFound(err) { if errdefs.IsNotFound(err) {
w := progress.ContextWriter(ctx) w := progress.ContextWriter(ctx)
w.Event(progress.Event{ w.Event(progress.Event{
@ -611,7 +607,7 @@ func (s *composeService) ensureVolume(ctx context.Context, project *types.Projec
}) })
// TODO we miss support for driver_opts and labels // TODO we miss support for driver_opts and labels
_, err := s.apiClient.VolumeCreate(ctx, mobyvolume.VolumeCreateBody{ _, err := s.apiClient.VolumeCreate(ctx, mobyvolume.VolumeCreateBody{
Labels: labels, Labels: volume.Labels,
Name: volume.Name, Name: volume.Name,
Driver: volume.Driver, Driver: volume.Driver,
DriverOpts: volume.DriverOpts, DriverOpts: volume.DriverOpts,