Removed Docker tasks, no use for them until now.

README.md

@@ -13,16 +13,13 @@ Choose from existing pre-configured configurations [^1] and start containers wit
 Pulls `nginx`, creates a new container with port binding `80:80` and hits the default site.
 
 ```csharp
-var containerBuilder = new ContainerBuilder()
+var containerBuilder = new TestcontainersBuilder()
   .WithImage("nginx")
   .WithPortBindings(80);
 
 using (var container = containerBuilder.Build())
 {
-  container.Pull();
-  container.Run();
   container.Start();
-
   var request = WebRequest.Create($"http://localhost:80");
 }
 ```

src/DotNet.Testcontainers.Tests/DockerImageTests.cs

@@ -33,10 +33,9 @@ public void Test_DockerContainerStartStop_WithValidImage_NoException()
       var dockerContainer = new TestcontainersBuilder().WithImage(dockerImage).Build();
 
       // Then
-      dockerContainer.Pull();
-      dockerContainer.Run();
       dockerContainer.Start();
       dockerContainer.Stop();
+      dockerContainer.Dispose();
     }
 
     [Fact]
@@ -56,15 +55,14 @@ public void Test_DockerContainerPortBindings_WithValidImage_NoException()
         .Build();
 
       // Then
-      dockerContainer.Pull();
-      dockerContainer.Run();
       dockerContainer.Start();
 
       var request = WebRequest.Create($"http://localhost:{port}");
 
       var response = (HttpWebResponse)request.GetResponse();
 
       dockerContainer.Stop();
+      dockerContainer.Dispose();
 
       isAvailable = response != null && response.StatusCode == HttpStatusCode.OK;
 

src/DotNet.Testcontainers/Builders/IContainerBuilder.cs

@@ -63,8 +63,6 @@ public interface IContainerBuilder
     /// <returns>A configured instance of <see cref="IContainerBuilder"/>.</returns>
     IContainerBuilder WithPortBindings(string hostPort, string containerPort);
 
-    IContainerBuilder WaitingFor();
-
     /// <summary>
     /// Builds the instance of <see cref="IDockerContainer"/> with the given configuration.
     /// </summary>

src/DotNet.Testcontainers/Builders/TestcontainersBuilder.cs

@@ -56,11 +56,6 @@ public IContainerBuilder WithPortBindings(string hostPort, string containerPort)
       return this;
     }
 
-    public IContainerBuilder WaitingFor()
-    {
-      return this;
-    }
-
     public IDockerContainer Build()
     {
       return new TestcontainersContainer(this.image, this.exposedPort, this.portBindings);

src/DotNet.Testcontainers/Clients/ITestcontainersClient.cs

@@ -1,6 +1,5 @@
 namespace DotNet.Testcontainers.Clients
 {
-  using System.Threading.Tasks;
   using Docker.DotNet.Models;
 
   public interface ITestcontainersClient
@@ -9,12 +8,12 @@ public interface ITestcontainersClient
 
     bool HasContainer(string containerId);
 
-    Task Pull(string image);
+    void Pull(string image);
 
-    string Run(string image, HostConfig hostConfig);
+    void Start(string containerId);
 
-    Task Start(string containerId);
+    void Stop(string containerId);
 
-    Task Stop(string containerId);
+    string Run(string image, HostConfig hostConfig);
   }
 }

src/DotNet.Testcontainers/Clients/TestcontainersClient.cs

@@ -4,7 +4,6 @@ namespace DotNet.Testcontainers.Clients
   using System.Collections.Generic;
   using System.Linq;
   using System.Runtime.InteropServices;
-  using System.Threading.Tasks;
   using Docker.DotNet;
   using Docker.DotNet.Models;
   using DotNet.Testcontainers.Diagnostics;
@@ -31,6 +30,11 @@ public static ITestcontainersClient Instance
 
     public bool HasImage(string image)
     {
+      if (string.IsNullOrWhiteSpace(image))
+      {
+        return false;
+      }
+
       return Docker.Images.ListImagesAsync(new ImagesListParameters
       {
         MatchName = image,
@@ -39,6 +43,11 @@ public bool HasImage(string image)
 
     public bool HasContainer(string containerId)
     {
+      if (string.IsNullOrWhiteSpace(containerId))
+      {
+        return false;
+      }
+
       return Docker.Containers.ListContainersAsync(new ContainersListParameters
       {
         All = true,
@@ -54,33 +63,28 @@ public bool HasContainer(string containerId)
       }).Result.Any();
     }
 
-    public Task Pull(string image)
+    public void Pull(string image)
     {
-      return Docker.Images.CreateImageAsync(new ImagesCreateParameters { FromImage = image }, null, DebugProgress.Instance);
+      Docker.Images.CreateImageAsync(new ImagesCreateParameters { FromImage = image }, null, DebugProgress.Instance).Wait();
     }
 
-    public string Run(string image, HostConfig hostConfig)
+    public void Start(string containerId)
     {
-      if (!this.HasImage(image))
-      {
-        this.Pull(image);
-      }
-
-      return Docker.Containers.CreateContainerAsync(new CreateContainerParameters
-      {
-        Image = image,
-        HostConfig = hostConfig,
-      }).Result.ID;
+      Docker.Containers.StartContainerAsync(containerId, new ContainerStartParameters { }).Wait();
     }
 
-    public Task Start(string containerId)
+    public void Stop(string containerId)
     {
-      return Docker.Containers.StartContainerAsync(containerId, new ContainerStartParameters { });
+      Docker.Containers.StopContainerAsync(containerId, new ContainerStopParameters { WaitBeforeKillSeconds = 30 }).Wait();
     }
 
-    public Task Stop(string containerId)
+    public string Run(string image, HostConfig hostConfig)
     {
-      return Docker.Containers.StopContainerAsync(containerId, new ContainerStopParameters { WaitBeforeKillSeconds = 30 });
+      return Docker.Containers.CreateContainerAsync(new CreateContainerParameters
+      {
+        Image = image,
+        HostConfig = hostConfig,
+      }).Result.ID;
     }
   }
 }

src/DotNet.Testcontainers/Containers/IDockerContainer.cs

@@ -4,10 +4,6 @@ namespace DotNet.Testcontainers.Containers
 
   public interface IDockerContainer : IDisposable
   {
-    void Pull();
-
-    void Run();
-
     void Start();
 
     void Stop();

src/DotNet.Testcontainers/Containers/TestcontainersContainer.cs

@@ -49,25 +49,27 @@ private HostConfig HostConfig
       }
     }
 
-    public void Pull()
+    public void Start()
     {
-      // TODO: Implement a proper strategy to wait until the container is up and running.
-      TestcontainersClient.Instance.Pull(this.Image.Image).Wait();
-    }
+      if (!TestcontainersClient.Instance.HasImage(this.Image.Image))
+      {
+        TestcontainersClient.Instance.Pull(this.Image.Image);
+      }
 
-    public void Run()
-    {
-      this.Id = TestcontainersClient.Instance.Run(this.Image.Image, this.HostConfig);
-    }
+      if (!TestcontainersClient.Instance.HasContainer(this.Id))
+      {
+        this.Id = TestcontainersClient.Instance.Run(this.Image.Image, this.HostConfig);
+      }
 
-    public void Start()
-    {
-      TestcontainersClient.Instance.Start(this.Id).Wait();
+      TestcontainersClient.Instance.Start(this.Id);
     }
 
     public void Stop()
     {
-      TestcontainersClient.Instance.Stop(this.Id).Wait();
+      if (TestcontainersClient.Instance.HasContainer(this.Id))
+      {
+        TestcontainersClient.Instance.Stop(this.Id);
+      }
     }
 
     public void Dispose()