Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Trim relative path indicators from Dockerfile path #1203

Merged
merged 1 commit into from
Jun 22, 2024
Merged

fix: Trim relative path indicators from Dockerfile path #1203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/Testcontainers/Builders/ImageFromDockerfileBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ namespace DotNet.Testcontainers.Builders
using System;
using System.Collections.Generic;
using System.IO;
using System.Text.RegularExpressions;
using Docker.DotNet.Models;
using DotNet.Testcontainers.Configurations;
using DotNet.Testcontainers.Images;
Expand Down Expand Up @@ -65,7 +66,8 @@ public ImageFromDockerfileBuilder WithName(IImage name)
/// <inheritdoc />
public ImageFromDockerfileBuilder WithDockerfile(string dockerfile)
{
return Merge(DockerResourceConfiguration, new ImageFromDockerfileConfiguration(dockerfile: dockerfile));
var dockerfileFilePath = Regex.Replace(dockerfile, "^\\.(\\/|\\\\)", string.Empty, RegexOptions.None, TimeSpan.FromSeconds(1));
return Merge(DockerResourceConfiguration, new ImageFromDockerfileConfiguration(dockerfile: dockerfileFilePath));
}

/// <inheritdoc />
Expand Down
9 changes: 6 additions & 3 deletions tests/Testcontainers.Tests/Unit/Images/ImageFromDockerfileTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,11 @@ public async Task ThrowsDockerfileDirectoryDoesNotExist()
Assert.Equal($"Directory '{Path.GetFullPath(dockerfileDirectory)}' does not exist.", exception.Message);
}

[Fact]
public async Task BuildsDockerImage()
[Theory]
[InlineData("Dockerfile")]
[InlineData("./Dockerfile")]
[InlineData(".\\Dockerfile")]
public async Task BuildsDockerImage(string dockerfile)
{
// Given
IImage tag1 = new DockerImage("localhost/testcontainers", Guid.NewGuid().ToString("D"), string.Empty);
Expand All @@ -110,7 +113,7 @@ public async Task BuildsDockerImage()

var imageFromDockerfileBuilder = new ImageFromDockerfileBuilder()
.WithName(tag1)
.WithDockerfile("Dockerfile")
.WithDockerfile(dockerfile)
.WithDockerfileDirectory("Assets/")
.WithDeleteIfExists(true)
.WithCreateParameterModifier(parameterModifier => parameterModifier.Tags.Add(tag2.FullName))
Expand Down
Loading