FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Merge pull request #894 from kish3007/cacheFromTest · docker-java/docker-java@42a50ec · GitHub

  1. docker-java
  2. docker-java

Repository navigation

Commit 42a50ec

Browse files
KostyaSha
authored
Merge pull request #894 from kish3007/cacheFromTest
Fixed missing test resources for cacheFrom test
2 parents ff99b1e + 65821cf commit 42a50ec

4 files changed

Lines changed: 20 additions & 2 deletions

File tree

‎src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,8 @@ public void cacheFrom() throws Exception {
326326
assertThat(inspectImageResponse1, not(nullValue()));
327327

328328
File baseDir2 = fileFromBuildTestResource("CacheFrom/test2");
329-
String imageId2 = dockerClient.buildImageCmd(baseDir2).withCacheFrom(new HashSet<>(Arrays.asList(imageId1)))
329+
String cacheImage = String.format("[\"%s\"]", imageId1);
330+
String imageId2 = dockerClient.buildImageCmd(baseDir2).withCacheFrom(new HashSet<>(Arrays.asList(cacheImage)))
330331
.exec(new BuildImageResultCallback())
331332
.awaitImageId();
332333
InspectImageResponse inspectImageResponse2 = dockerClient.inspectImageCmd(imageId2).exec();

‎src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,8 @@ public void cacheFrom() throws Exception {
331331
assertThat(inspectImageResponse1, not(nullValue()));
332332

333333
File baseDir2 = fileFromBuildTestResource("CacheFrom/test2");
334-
String imageId2 = dockerClient.buildImageCmd(baseDir2).withCacheFrom(new HashSet<>(Arrays.asList(imageId1)))
334+
String cacheImage = String.format("[\"%s\"]", imageId1);
335+
String imageId2 = dockerClient.buildImageCmd(baseDir2).withCacheFrom(new HashSet<>(Arrays.asList(cacheImage)))
335336
.exec(new BuildImageResultCallback())
336337
.awaitImageId();
337338
InspectImageResponse inspectImageResponse2 = dockerClient.inspectImageCmd(imageId2).exec();

‎src/test/resources/buildTests/CacheFrom/test1/Dockerfile‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
FROM ubuntu:latest
2+
3+
RUN echo "Step 1"
4+
5+
RUN echo "Step 2"
6+
7+
RUN echo "Step 3"

‎src/test/resources/buildTests/CacheFrom/test2/Dockerfile‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
FROM ubuntu:latest
2+
3+
RUN echo "Step 1"
4+
5+
RUN echo "Step 2"
6+
7+
RUN echo "Step 3"
8+
9+
RUN echo "Step 4"

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL