diff --git a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java index 20ac2b62d..db94563c4 100644 --- a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java +++ b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java @@ -326,7 +326,8 @@ public void cacheFrom() throws Exception { assertThat(inspectImageResponse1, not(nullValue())); File baseDir2 = fileFromBuildTestResource("CacheFrom/test2"); - String imageId2 = dockerClient.buildImageCmd(baseDir2).withCacheFrom(new HashSet<>(Arrays.asList(imageId1))) + String cacheImage = String.format("[\"%s\"]", imageId1); + String imageId2 = dockerClient.buildImageCmd(baseDir2).withCacheFrom(new HashSet<>(Arrays.asList(cacheImage))) .exec(new BuildImageResultCallback()) .awaitImageId(); InspectImageResponse inspectImageResponse2 = dockerClient.inspectImageCmd(imageId2).exec(); diff --git a/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java index 54ede31dd..b2c3b4b57 100644 --- a/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java +++ b/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java @@ -331,7 +331,8 @@ public void cacheFrom() throws Exception { assertThat(inspectImageResponse1, not(nullValue())); File baseDir2 = fileFromBuildTestResource("CacheFrom/test2"); - String imageId2 = dockerClient.buildImageCmd(baseDir2).withCacheFrom(new HashSet<>(Arrays.asList(imageId1))) + String cacheImage = String.format("[\"%s\"]", imageId1); + String imageId2 = dockerClient.buildImageCmd(baseDir2).withCacheFrom(new HashSet<>(Arrays.asList(cacheImage))) .exec(new BuildImageResultCallback()) .awaitImageId(); InspectImageResponse inspectImageResponse2 = dockerClient.inspectImageCmd(imageId2).exec(); diff --git a/src/test/resources/buildTests/CacheFrom/test1/Dockerfile b/src/test/resources/buildTests/CacheFrom/test1/Dockerfile new file mode 100644 index 000000000..44cb26e00 --- /dev/null +++ b/src/test/resources/buildTests/CacheFrom/test1/Dockerfile @@ -0,0 +1,7 @@ +FROM ubuntu:latest + +RUN echo "Step 1" + +RUN echo "Step 2" + +RUN echo "Step 3" \ No newline at end of file diff --git a/src/test/resources/buildTests/CacheFrom/test2/Dockerfile b/src/test/resources/buildTests/CacheFrom/test2/Dockerfile new file mode 100644 index 000000000..521ee8b78 --- /dev/null +++ b/src/test/resources/buildTests/CacheFrom/test2/Dockerfile @@ -0,0 +1,9 @@ +FROM ubuntu:latest + +RUN echo "Step 1" + +RUN echo "Step 2" + +RUN echo "Step 3" + +RUN echo "Step 4" \ No newline at end of file