From b3422c87f436f04cf934070e82cd592c6d9e30e9 Mon Sep 17 00:00:00 2001 From: Pieter van de Bruggen Date: Wed, 3 Jul 2019 16:58:42 -0700 Subject: [PATCH] Pull the project name from docker-compose labels, when available --- pkg/gui/gui.go | 1 + pkg/gui/project_panel.go | 12 ++++++++++-- pkg/gui/view_helpers.go | 4 ---- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/pkg/gui/gui.go b/pkg/gui/gui.go index 30367a47..8ef53626 100644 --- a/pkg/gui/gui.go +++ b/pkg/gui/gui.go @@ -271,6 +271,7 @@ func (gui *Gui) Run() error { gui.waitForIntro.Wait() gui.goEvery(time.Millisecond*50, gui.renderAppStatus) gui.goEvery(time.Millisecond*30, gui.reRenderMain) + gui.goEvery(time.Millisecond*100, gui.refreshProject) gui.goEvery(time.Millisecond*100, gui.refreshContainersAndServices) gui.goEvery(time.Millisecond*100, gui.refreshVolumes) gui.goEvery(time.Millisecond*1000, gui.DockerCommand.UpdateContainerDetails) diff --git a/pkg/gui/project_panel.go b/pkg/gui/project_panel.go index 88b5897e..76435f6b 100644 --- a/pkg/gui/project_panel.go +++ b/pkg/gui/project_panel.go @@ -31,11 +31,19 @@ func (gui *Gui) getProjectContextTitles() []string { func (gui *Gui) refreshProject() error { v := gui.getProjectView() - dirName := path.Base(gui.Config.ProjectDir) + projectName := path.Base(gui.Config.ProjectDir) + if gui.DockerCommand.InDockerComposeProject { + for _, service := range gui.DockerCommand.Services { + if service.Container != nil { + projectName = service.Container.Details.Config.Labels["com.docker.compose.project"] + break + } + } + } gui.g.Update(func(*gocui.Gui) error { v.Clear() - fmt.Fprint(v, dirName) + fmt.Fprint(v, projectName) return nil }) diff --git a/pkg/gui/view_helpers.go b/pkg/gui/view_helpers.go index 633df793..d661a9d9 100644 --- a/pkg/gui/view_helpers.go +++ b/pkg/gui/view_helpers.go @@ -16,10 +16,6 @@ func (gui *Gui) refreshSidePanels(g *gocui.Gui) error { return err } - if err := gui.refreshProject(); err != nil { - return err - } - return nil }