1
0
mirror of https://github.com/amir20/dozzle.git synced 2025-12-24 22:39:18 +01:00

fix: fixes broken image tag in title bar (#3176)

This commit is contained in:
Amir Raminfar
2024-08-02 17:24:18 -07:00
committed by GitHub
parent db1cccc61f
commit b38a02f5ba
8 changed files with 6 additions and 16 deletions

View File

@@ -246,7 +246,6 @@ func (c *Client) StreamNewContainers(ctx context.Context, containers chan<- dock
Image: resp.Container.Image,
Labels: resp.Container.Labels,
Group: resp.Container.Group,
ImageID: resp.Container.ImageId,
Created: resp.Container.Created.AsTime(),
State: resp.Container.State,
Health: resp.Container.Health,
@@ -281,7 +280,6 @@ func (c *Client) FindContainer(containerID string) (docker.Container, error) {
Image: response.Container.Image,
Labels: response.Container.Labels,
Group: response.Container.Group,
ImageID: response.Container.ImageId,
Created: response.Container.Created.AsTime(),
State: response.Container.State,
Health: response.Container.Health,
@@ -317,7 +315,6 @@ func (c *Client) ListContainers() ([]docker.Container, error) {
Image: container.Image,
Labels: container.Labels,
Group: container.Group,
ImageID: container.ImageId,
Created: container.Created.AsTime(),
State: container.State,
Health: container.Health,

View File

@@ -116,7 +116,6 @@ func init() {
Name: "test",
Host: "localhost",
Image: "test",
ImageID: "test",
State: "running",
Health: "healthy",
Group: "test",
@@ -149,7 +148,6 @@ func TestFindContainer(t *testing.T) {
Name: "test",
Host: "localhost",
Image: "test",
ImageID: "test",
State: "running",
Health: "healthy",
Group: "test",
@@ -176,7 +174,6 @@ func TestListContainers(t *testing.T) {
Name: "test",
Host: "localhost",
Image: "test",
ImageID: "test",
State: "running",
Health: "healthy",
Group: "test",

View File

@@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.34.2
// protoc v5.27.1
// protoc v5.27.3
// source: rpc.proto
package pb

View File

@@ -1,7 +1,7 @@
// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
// versions:
// - protoc-gen-go-grpc v1.4.0
// - protoc v5.27.1
// - protoc v5.27.3
// source: rpc.proto
package pb

View File

@@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.34.2
// protoc v5.27.1
// protoc v5.27.3
// source: types.proto
package pb

View File

@@ -180,7 +180,6 @@ func (s *server) FindContainer(ctx context.Context, in *pb.FindContainerRequest)
Id: container.ID,
Name: container.Name,
Image: container.Image,
ImageId: container.ImageID,
Command: container.Command,
Created: timestamppb.New(container.Created),
State: container.State,
@@ -217,7 +216,6 @@ func (s *server) ListContainers(ctx context.Context, in *pb.ListContainersReques
Id: container.ID,
Name: container.Name,
Image: container.Image,
ImageId: container.ImageID,
Created: timestamppb.New(container.Created),
State: container.State,
Health: container.Health,
@@ -263,7 +261,6 @@ func (s *server) StreamContainerStarted(in *pb.StreamContainerStartedRequest, ou
Id: container.ID,
Name: container.Name,
Image: container.Image,
ImageId: container.ImageID,
Created: timestamppb.New(container.Created),
State: container.State,
Health: container.Health,

View File

@@ -368,7 +368,6 @@ func newContainer(c types.Container, host string) Container {
ID: c.ID[:12],
Name: name,
Image: c.Image,
ImageID: c.ImageID,
Command: c.Command,
Created: time.Unix(c.Created, 0),
State: c.State,
@@ -390,11 +389,12 @@ func newContainerFromJSON(c types.ContainerJSON, host string) Container {
group = c.Config.Labels["dev.dozzle.group"]
}
log.Debugf("newContainerFromJSON: %s", c.Config.Image)
container := Container{
ID: c.ID[:12],
Name: name,
Image: c.Image,
ImageID: c.Image,
Image: c.Config.Image,
Command: strings.Join(c.Config.Entrypoint, " ") + " " + strings.Join(c.Config.Cmd, " "),
State: c.State.Status,
Host: host,

View File

@@ -13,7 +13,6 @@ type Container struct {
ID string `json:"id"`
Name string `json:"name"`
Image string `json:"image"`
ImageID string `json:"imageId"`
Command string `json:"command"`
Created time.Time `json:"created"`
StartedAt time.Time `json:"startedAt,omitempty"`