Merge remote-tracking branch 'origin/develop' into 0xced-IDatabaseCon…

…tainer
testcontainers · Oct 14, 2023 · 9dd0cbb · 9dd0cbb
2 parents 5762b04 + 6e31cf3
commit 9dd0cbb
Showing 1 changed file with 3 additions and 11 deletions.
diff --git a/src/Testcontainers/Containers/DockerContainer.cs b/src/Testcontainers/Containers/DockerContainer.cs
@@ -7,7 +7,6 @@ namespace DotNet.Testcontainers.Containers
   using System.Linq;
   using System.Threading;
   using System.Threading.Tasks;
-  using Docker.DotNet;
   using Docker.DotNet.Models;
   using DotNet.Testcontainers.Clients;
   using DotNet.Testcontainers.Configurations;
@@ -472,23 +471,16 @@ protected virtual async Task UnsafeStopAsync(CancellationToken ct = default)
       await _client.StopAsync(_container.ID, ct)
         .ConfigureAwait(false);
 
-      try
-      {
-        _container = await _client.Container.ByIdAsync(_container.ID, ct)
-          .ConfigureAwait(false);
-      }
-      catch (DockerApiException)
-      {
-        _container = new ContainerInspectResponse();
-      }
+      _container = await _client.Container.ByIdAsync(_container.ID, ct)
+        .ConfigureAwait(false);
 
       Stopped?.Invoke(this, EventArgs.Empty);
     }
 
     /// <inheritdoc />
     protected override bool Exists()
     {
-      return ContainerHasBeenCreatedStates.HasFlag(State);
+      return _container != null && ContainerHasBeenCreatedStates.HasFlag(State);
     }
   }
 }