Merge branch 'develop' into bug/http-wait-strategy-disposal

src/Testcontainers/Clients/TestcontainersClient.cs

@@ -5,13 +5,15 @@ namespace DotNet.Testcontainers.Clients
  using System.IO;
  using System.Linq;
  using System.Text;
+ using System.Text.RegularExpressions;
  using System.Threading;
  using System.Threading.Tasks;
  using Docker.DotNet;
  using Docker.DotNet.Models;
  using DotNet.Testcontainers.Builders;
  using DotNet.Testcontainers.Configurations;
  using DotNet.Testcontainers.Containers;
+ using DotNet.Testcontainers.Images;
  using ICSharpCode.SharpZipLib.Tar;
  using Microsoft.Extensions.Logging;
 
@@ -28,6 +30,8 @@ internal sealed class TestcontainersClient : ITestcontainersClient
 
  private static readonly string OSRootDirectory = Path.GetPathRoot(Directory.GetCurrentDirectory());
 
+ private static readonly Regex FromLinePattern = new Regex("FROM (?<arg>--[^\\s]+\\s)*(?<image>[^\\s]+).*", RegexOptions.None, TimeSpan.FromSeconds(1));
+
  private readonly DockerRegistryAuthenticationProvider _registryAuthenticationProvider;
 
  /// <summary>
@@ -290,19 +294,7 @@ public async Task<string> RunAsync(IContainerConfiguration configuration, Cancel
 
  if (configuration.ImagePullPolicy(cachedImage))
  {
- var dockerRegistryServerAddress = configuration.Image.GetHostname();
-
- if (dockerRegistryServerAddress == null)
- {
- var info = await System.GetInfoAsync(ct)
- .ConfigureAwait(false);
-
- dockerRegistryServerAddress = info.IndexServerAddress;
- }
-
- var authConfig = _registryAuthenticationProvider.GetAuthConfig(dockerRegistryServerAddress);
-
- await Image.CreateAsync(configuration.Image, authConfig, ct)
+ await PullImageAsync(configuration.Image, ct)
  .ConfigureAwait(false);
  }
 
@@ -327,9 +319,22 @@ await Task.WhenAll(configuration.ResourceMappings.Values.Select(resourceMapping
  /// <inheritdoc />
  public async Task<string> BuildAsync(IImageFromDockerfileConfiguration configuration, CancellationToken ct = default)
  {
+ var dockerfileFilePath = Path.Combine(configuration.DockerfileDirectory, configuration.Dockerfile);
+
  var cachedImage = await Image.ByNameAsync(configuration.Image.FullName, ct)
  .ConfigureAwait(false);
 
+ if (File.Exists(dockerfileFilePath))
+ {
+ await Task.WhenAll(File.ReadAllLines(dockerfileFilePath)
+ .Select(line => FromLinePattern.Match(line))
+ .Where(match => match.Success)
+ .Select(match => match.Groups["image"])
+ .Select(group => group.Value)
+ .Select(image => new DockerImage(image))
+ .Select(image => PullImageAsync(image, ct)));
+ }
+
  if (configuration.ImageBuildPolicy(cachedImage))
  {
  _ = await Image.BuildAsync(configuration, ct)
@@ -338,5 +343,28 @@ public async Task<string> BuildAsync(IImageFromDockerfileConfiguration configura
 
  return configuration.Image.FullName;
  }
+
+ /// <summary>
+ /// Pulls an image from a registry.
+ /// </summary>
+ /// <param name="image">The image to pull.</param>
+ /// <param name="ct">Cancellation token.</param>
+ private async Task PullImageAsync(IImage image, CancellationToken ct = default)
+ {
+ var dockerRegistryServerAddress = image.GetHostname();
+
+ if (dockerRegistryServerAddress == null)
+ {
+ var info = await System.GetInfoAsync(ct)
+ .ConfigureAwait(false);
+
+ dockerRegistryServerAddress = info.IndexServerAddress;
+ }
+
+ var authConfig = _registryAuthenticationProvider.GetAuthConfig(dockerRegistryServerAddress);
+
+ await Image.CreateAsync(image, authConfig, ct)
+ .ConfigureAwait(false);
+ }
  }
 }

src/Testcontainers/Images/IgnoreFile.cs

@@ -96,7 +96,7 @@ public IgnoreFile(IEnumerable<string> patterns, ILogger logger)
  return new KeyValuePair<string, bool>(key, value);
  })
 
- // Compile and cache regular expression to increase the performance.
+ // Cache regular expression to increase the performance.
  .Select(ignorePattern =>
  {
  var key = ignorePattern.Key;