Skip to content

Allow an explicit Dockerfile location string to be specified to the build command #825

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

Merged
KostyaSha merged 2 commits into from
Apr 23, 2017
Merged

Allow an explicit Dockerfile location string to be specified to the build command #825

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7521a5f
When supplying a TAR stream to the build command, API consumers just …
rchodava Apr 1, 2017
d025863
Add netty test for building with an explicitly specified Dockerfile l…
rchodava Apr 5, 2017
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
2 changes: 2 additions & 0 deletions src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,8 @@ public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildRespon

BuildImageCmd withDockerfile(File dockerfile);

BuildImageCmd withDockerfilePath(String dockerfilePath);

BuildImageCmd withNoCache(Boolean noCache);

BuildImageCmd withRemove(Boolean rm);
Expand Down
13 changes: 12 additions & 1 deletion src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ public class BuildImageCmdImpl extends AbstrAsyncDockerCmd<BuildImageCmd, BuildR

private File dockerFile;

private String dockerFilePath;

private File baseDirectory;

private String cpusetcpus;
Expand Down Expand Up @@ -119,7 +121,9 @@ public Boolean hasPullEnabled() {

@Override
public String getPathToDockerfile() {
if (baseDirectory != null && dockerFile != null) {
if (dockerFilePath != null) {
return dockerFilePath;
} else if (baseDirectory != null && dockerFile != null) {
return FilePathUtil.relativize(baseDirectory, dockerFile);
} else {
return null;
Expand Down Expand Up @@ -287,6 +291,13 @@ public BuildImageCmdImpl withDockerfile(File dockerfile) {
return this;
}

@Override
public BuildImageCmd withDockerfilePath(String dockerfilePath) {
checkNotNull(dockerfilePath, "dockerfilePath is null");
this.dockerFilePath = dockerfilePath;
return this;
}

@Override
public BuildImageCmdImpl withTarInputStream(InputStream tarInputStream) {
checkNotNull(tarInputStream, "tarInputStream is null");
Expand Down
14 changes: 14 additions & 0 deletions src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,15 @@ public void buildImageFromTar() throws Exception {
assertThat(response, containsString("Successfully executed testrun.sh"));
}

@Test
public void buildImageFromTarWithDockerfileNotInBaseDirectory() throws Exception {
File baseDir = fileFromBuildTestResource("dockerfileNotInBaseDirectory");
Collection<File> files = FileUtils.listFiles(baseDir, TrueFileFilter.INSTANCE, TrueFileFilter.INSTANCE);
File tarFile = CompressArchiveUtil.archiveTARFiles(baseDir, files, UUID.randomUUID().toString());
String response = dockerfileBuild(new FileInputStream(tarFile), "dockerfileFolder/Dockerfile");
assertThat(response, containsString("Successfully executed testrun.sh"));
}

@Test
public void onBuild() throws Exception {
File baseDir = fileFromBuildTestResource("ONBUILD/parent");
Expand Down Expand Up @@ -123,6 +132,11 @@ public void addFolder() throws Exception {
assertThat(response, containsString("Successfully executed testAddFolder.sh"));
}

private String dockerfileBuild(InputStream tarInputStream, String dockerFilePath) throws Exception {

return execBuild(dockerClient.buildImageCmd().withTarInputStream(tarInputStream).withDockerfilePath(dockerFilePath));
}

private String dockerfileBuild(InputStream tarInputStream) throws Exception {

return execBuild(dockerClient.buildImageCmd().withTarInputStream(tarInputStream));
Expand Down
14 changes: 14 additions & 0 deletions src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,15 @@ public void buildImageFromTar() throws Exception {
assertThat(response, containsString("Successfully executed testrun.sh"));
}

@Test
public void buildImageFromTarWithDockerfileNotInBaseDirectory() throws Exception {
File baseDir = fileFromBuildTestResource("dockerfileNotInBaseDirectory");
Collection<File> files = FileUtils.listFiles(baseDir, TrueFileFilter.INSTANCE, TrueFileFilter.INSTANCE);
File tarFile = CompressArchiveUtil.archiveTARFiles(baseDir, files, UUID.randomUUID().toString());
String response = dockerfileBuild(new FileInputStream(tarFile), "dockerfileFolder/Dockerfile");
assertThat(response, containsString("Successfully executed testrun.sh"));
}

@Test
public void onBuild() throws Exception {
File baseDir = fileFromBuildTestResource("ONBUILD/parent");
Expand Down Expand Up @@ -128,6 +137,11 @@ public void addFolder() throws Exception {
assertThat(response, containsString("Successfully executed testAddFolder.sh"));
}

private String dockerfileBuild(InputStream tarInputStream, String dockerFilePath) throws Exception {

return execBuild(dockerClient.buildImageCmd().withTarInputStream(tarInputStream).withDockerfilePath(dockerFilePath));
}

private String dockerfileBuild(InputStream tarInputStream) throws Exception {

return execBuild(dockerClient.buildImageCmd().withTarInputStream(tarInputStream));
Expand Down