Update to waitForContainer

MadLittleMods · MadLittleMods · commit da98b903e9ab · 2025-05-28T12:51:33.000-05:00
See #781 (comment)
diff --git a/internal/docker/deployer.go b/internal/docker/deployer.go
@@ -313,7 +313,7 @@ func (d *Deployer) StartServer(hsDep *HomeserverDeployment) error {
 	}
 
 	// Wait for the container to be ready.
-	err = waitForPorts(ctx, d.Docker, hsDep.ContainerID)
+	err = waitForContainer(ctx, d.Docker, hsDep.ContainerID)
 	if err != nil {
 		return fmt.Errorf("failed to wait for ports on container %s: %s", hsDep.ContainerID, err)
 	}
@@ -455,7 +455,7 @@ func deployImage(
 	}
 
 	// Wait for the container to be ready.
-	err = waitForPorts(ctx, docker, containerID)
+	err = waitForContainer(ctx, docker, containerID)
 	if err != nil {
 		return stubDeployment, fmt.Errorf("%s: failed to wait for ports on container %s: %w", contextStr, containerID, err)
 	}
@@ -564,8 +564,8 @@ func getHostAccessibleHomeserverURLs(ctx context.Context, docker *client.Client,
 	return baseURL, fedBaseURL, nil
 }
 
-// waitForPorts waits until a homeserver container has NAT ports assigned.
-func waitForPorts(ctx context.Context, docker *client.Client, containerID string) (err error) {
+// waitForContainer waits until a homeserver container has NAT ports assigned.
+func waitForContainer(ctx context.Context, docker *client.Client, containerID string) (err error) {
 	// We need to hammer the inspect endpoint until the ports show up, they don't appear immediately.
 	inspectStartTime := time.Now()
 	for time.Since(inspectStartTime) < time.Second {

Original file line number	Diff line number	Diff line change
`@@ -313,7 +313,7 @@ func (d Deployer) StartServer(hsDep HomeserverDeployment) error {`
`313`	`313`	`}`
`314`	`314`
`315`	`315`	`// Wait for the container to be ready.`
`316`		`- err = waitForPorts(ctx, d.Docker, hsDep.ContainerID)`
	`316`	`+ err = waitForContainer(ctx, d.Docker, hsDep.ContainerID)`
`317`	`317`	`if err != nil {`
`318`	`318`	`return fmt.Errorf("failed to wait for ports on container %s: %s", hsDep.ContainerID, err)`
`319`	`319`	`}`
`@@ -455,7 +455,7 @@ func deployImage(`
`455`	`455`	`}`
`456`	`456`
`457`	`457`	`// Wait for the container to be ready.`
`458`		`- err = waitForPorts(ctx, docker, containerID)`
	`458`	`+ err = waitForContainer(ctx, docker, containerID)`
`459`	`459`	`if err != nil {`
`460`	`460`	`return stubDeployment, fmt.Errorf("%s: failed to wait for ports on container %s: %w", contextStr, containerID, err)`
`461`	`461`	`}`
`@@ -564,8 +564,8 @@ func getHostAccessibleHomeserverURLs(ctx context.Context, docker *client.Client,`
`564`	`564`	`return baseURL, fedBaseURL, nil`
`565`	`565`	`}`
`566`	`566`
`567`		`-// waitForPorts waits until a homeserver container has NAT ports assigned.`
`568`		`-func waitForPorts(ctx context.Context, docker *client.Client, containerID string) (err error) {`
	`567`	`+// waitForContainer waits until a homeserver container has NAT ports assigned.`
	`568`	`+func waitForContainer(ctx context.Context, docker *client.Client, containerID string) (err error) {`
`569`	`569`	`// We need to hammer the inspect endpoint until the ports show up, they don't appear immediately.`
`570`	`570`	`inspectStartTime := time.Now()`
`571`	`571`	`for time.Since(inspectStartTime) < time.Second {`