chore(localstack): using testcontainers.ContainerHost instead of direct relying on testcontainers.DockerProvider.

Signed-off-by: Marat Abrarov <abrarov@gmail.com>

Author: mabrarov

modules/localstack/localstack.go

@@ -99,7 +99,7 @@ func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustom
 		envVar = localstackHostEnvVar
 	}
 
-	hostnameExternalReason, err := configureDockerHost(&localStackReq, envVar)
+	hostnameExternalReason, err := configureDockerHost(&localStackReq, envVar, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -125,7 +125,7 @@ func StartContainer(ctx context.Context, overrideReq OverrideContainerRequestOpt
 	return RunContainer(ctx, overrideReq)
 }
 
-func configureDockerHost(req *LocalStackContainerRequest, envVar string) (string, error) {
+func configureDockerHost(req *LocalStackContainerRequest, envVar string, opts ...testcontainers.ContainerCustomizer) (string, error) {
 	reason := ""
 
 	if _, ok := req.Env[envVar]; ok {
@@ -141,13 +141,7 @@ func configureDockerHost(req *LocalStackContainerRequest, envVar string) (string
 		return "to match last network alias on container with non-default network", nil
 	}
 
-	dockerProvider, err := testcontainers.NewDockerProvider()
-	if err != nil {
-		return reason, err
-	}
-	defer dockerProvider.Close()
-
-	daemonHost, err := dockerProvider.DaemonHost(context.Background())
+	daemonHost, err := testcontainers.ContainerHost(context.Background(), opts...)
 	if err != nil {
 		return reason, err
 	}

modules/localstack/localstack_test.go

@@ -61,12 +61,7 @@ func TestConfigureDockerHost(t *testing.T) {
 		})
 
 		t.Run("HOSTNAME_EXTERNAL matches the daemon host because there are no aliases", func(t *testing.T) {
-			dockerProvider, err := testcontainers.NewDockerProvider()
-			require.NoError(t, err)
-			defer dockerProvider.Close()
-
-			// because the daemon host could be a remote one, we need to get it from the provider
-			expectedDaemonHost, err := dockerProvider.DaemonHost(context.Background())
+			expectedDaemonHost, err := testcontainers.ContainerHost(context.Background())
 			require.NoError(t, err)
 
 			req := generateContainerRequest()