#274 Fix stdout explicitly using follow flag (#275)

* #274 Fix stdout explicitly using follow flag * Fix linting
pygmystack · Nov 10, 2020 · da80a22 · da80a22
1 parent fb9b78c
commit da80a22
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/service/interface/docker/docker.go b/service/interface/docker/docker.go
@@ -448,7 +448,7 @@ func DockerContainerStart(ID string, options types.ContainerStartOptions) error
 	return err
 }
 
-func DockerContainerLogs(ID string) ([]byte, error) {
+func DockerContainerLogs(ID string, Follow bool) ([]byte, error) {
 	ctx := context.Background()
 	cli, err := client.NewClientWithOpts()
 	cli.NegotiateAPIVersion(ctx)
@@ -458,6 +458,7 @@ func DockerContainerLogs(ID string) ([]byte, error) {
 	b, _ := cli.ContainerLogs(ctx, ID, types.ContainerLogsOptions{
 		ShowStdout: true,
 		ShowStderr: true,
+		Follow:     Follow,
 	})
 
 	buf := new(bytes.Buffer)

diff --git a/service/interface/interface.go b/service/interface/interface.go
@@ -122,7 +122,7 @@ func (Service *Service) GetRunning() (types.Container, error) {
 	containers, _ := docker.DockerContainerList()
 	for _, container := range containers {
 		if _, ok := container.Labels["pygmy.name"]; ok {
-			if strings.Contains(container.Names[0], Service.Config.Labels["pygmy.name"]) {
+			if strings.Contains(container.Labels["pygmy.name"], Service.Config.Labels["pygmy.name"]) {
 				return container, nil
 			}
 		}
@@ -259,6 +259,6 @@ func (Service *Service) DockerRun() ([]byte, error) {
 		return []byte{}, err
 	}
 
-	return docker.DockerContainerLogs(resp.ID)
+	return docker.DockerContainerLogs(resp.ID, Service.HostConfig.AutoRemove)
 
 }