tensorchord · gaocegege · Nov 16, 2022 · Nov 15, 2022 · Nov 16, 2022 · Nov 16, 2022
@@ -103,13 +103,14 @@ func renderPortBindings(w io.Writer, ports []types.PortBinding) {
 	if ports == nil {
 		return
 	}
-	table := createTable(w, []string{"Container Port", "Protocol", "Host IP", "Host Port"})
+	table := createTable(w, []string{"Name", "Container Port", "Protocol", "Host IP", "Host Port"})
 	for _, port := range ports {
-		row := make([]string, 4)
-		row[0] = port.Port
-		row[1] = port.Protocol
-		row[2] = port.HostIP
-		row[3] = port.HostPort
+		row := make([]string, 5)
+		row[0] = port.Name
+		row[1] = port.Port
+		row[2] = port.Protocol
+		row[3] = port.HostIP
+		row[4] = port.HostPort
 		table.Append(row)
 	}
 	table.Render()

@@ -192,7 +192,12 @@ func (e dockerEngine) ListEnvPortBinding(ctx context.Context, env string) ([]typ
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to get container")
 	}
-	ports := types.NewPortBindingFromContainerJSON(ctr)
+
+	ports, err := types.NewPortBindingFromContainerJSON(ctr)
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to get port binding from container json")
+	}
+
 	return ports, nil
 }
 

@@ -219,6 +219,7 @@ func (e *envdServerEngine) ListEnvPortBinding(
 	// TODO(gaocegege): Remove hard coded.
 	res := []types.PortBinding{
 		{
+			Name:     "ssh",
 			Port:     "2222",
 			Protocol: "TCP",
 			HostIP:   "localhost",

@@ -152,6 +152,7 @@ type RepoInfo struct {
 }
 
 type PortBinding struct {
+	Name     string
 	Port     string
 	Protocol string
 	HostIP   string
@@ -278,7 +279,18 @@ func NewDependencyFromImageSummary(img types.ImageSummary) (*Dependency, error)
 	return NewDependencyFromLabels(img.Labels)
 }
 
-func NewPortBindingFromContainerJSON(ctr types.ContainerJSON) []PortBinding {
+func NewPortBindingFromContainerJSON(ctr types.ContainerJSON) ([]PortBinding, error) {
+	var labels []servertypes.EnvironmentPort
+	err := json.Unmarshal([]byte(ctr.Config.Labels[ImageLabelPorts]), &labels)
+	if err != nil {
+		return nil, err
+	}
+
+	var portMap = make(map[string]string)
+	for _, label := range labels {
+		portMap[fmt.Sprint(label.Port)] = label.Name
+	}
+
 	config := ctr.HostConfig.PortBindings
 	var ports []PortBinding
 	for port, bindings := range config {
@@ -287,13 +299,15 @@ func NewPortBindingFromContainerJSON(ctr types.ContainerJSON) []PortBinding {
 		}
 		binding := bindings[len(bindings)-1]
 		ports = append(ports, PortBinding{
+			Name:     portMap[port.Port()],
 			Port:     port.Port(),
 			Protocol: port.Proto(),
 			HostIP:   binding.HostIP,
 			HostPort: binding.HostPort,
 		})
 	}
-	return ports
+
+	return ports, nil
 }
 
 func NewDependencyFromLabels(label map[string]string) (*Dependency, error) {