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

Jump to bottom

Handle properly when dockerFile and dockerFileDir also set #624

Closed
wants to merge 1 commit into from
Closed

Handle properly when dockerFile and dockerFileDir also set #624

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
9 changes: 8 additions & 1 deletion src/main/java/io/fabric8/maven/docker/config/BuildImageConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,14 @@ public String initAndValidate(Logger log) throws IllegalArgumentException {

// Initialize the dockerfile location and the build mode
private void initDockerFileFile(Logger log) {
if (dockerFile != null) {
if (dockerFile != null && dockerFileDir != null) {
dockerFileFile = new File(dockerFile);
if (dockerFileFile.isAbsolute()) {
throw new IllegalArgumentException("<dockerFile> can not be absolute path if <dockerFileDir> also set.");
}
dockerFileFile = new File(dockerFileDir, dockerFile);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please add a check, that dockerFile is not an absolute path and throw an error if it is ?

dockerFileMode = true;
} else if (dockerFile != null) {
dockerFileFile = new File(dockerFile);
dockerFileMode = true;
} else if (dockerFileDir != null) {
Expand Down
20 changes: 20 additions & 0 deletions src/test/java/io/fabric8/maven/docker/config/BuildImageConfigurationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,26 @@ public void simpleDockerfileDir() {
assertEquals(config.getDockerFile(),new File("src/docker/Dockerfile"));
}

@Test
public void DockerfileDirAndDockerfileAlsoSet() {
BuildImageConfiguration config =
new BuildImageConfiguration.Builder().
dockerFileDir("/tmp/").
dockerFile("Dockerfile").build();
config.initAndValidate(logger);
assertTrue(config.isDockerFileMode());
assertEquals(config.getDockerFile(),new File("/tmp/Dockerfile"));
}

@Test(expected=IllegalArgumentException.class)
public void DockerfileDirAndDockerfileAlsoSetButDockerfileIsAbsoluteExceptionThrown() {
BuildImageConfiguration config =
new BuildImageConfiguration.Builder().
dockerFileDir("/tmp/").
dockerFile("/Dockerfile").build();
config.initAndValidate(logger);
}

@Test
public void deprecatedDockerfileDir() {
AssemblyConfiguration assemblyConfig = new AssemblyConfiguration.Builder().dockerFileDir("src/docker").build();
Expand Down