Skip to content

Commit 5480c1c

Browse files
Roman VasilevichArtDu
authored andcommitted
Fix NullPointerException during building docker image
1 parent 5b7bac3 commit 5480c1c

File tree

4 files changed

+7
-2
lines changed

4 files changed

+7
-2
lines changed

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
timeout-minutes: 25
7474
strategy:
7575
matrix:
76-
tarantool-version: [ "1.x-centos7", "2.11.2-ubuntu20.04", "3.0.1" ]
76+
tarantool-version: [ "1.x-centos7", "2.11.2-ubuntu20.04", "3.0.1-old" ]
7777
fail-fast: false
7878
steps:
7979
- uses: actions/checkout@v4

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
## [Unreleased]
44

5+
## [1.3.2] - 2024-04-25
6+
- Fix NullPointerException during building docker image when images with null tags exist on a local machine.
7+
58
## [1.3.1] - 2024-02-13
69

710
- Change `TARANTOOL_VERSION` default value from `2.11.2-centos7` to `2.11.2-ubuntu20.04`. It ruins rocks building due to certificate issues on centos.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Add the Maven dependency:
1414
<dependency>
1515
<groupId>io.tarantool</groupId>
1616
<artifactId>testcontainers-java-tarantool</artifactId>
17-
<version>1.3.1</version>
17+
<version>1.3.2</version>
1818
</dependency>
1919
```
2020

src/main/java/org/testcontainers/containers/TarantoolContainerImageHelper.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import java.util.HashSet;
77
import java.util.List;
88
import java.util.Map;
9+
import java.util.Objects;
910

1011
import com.github.dockerjava.api.DockerClient;
1112
import com.github.dockerjava.api.command.BuildImageCmd;
@@ -71,6 +72,7 @@ private static boolean hasImage(String tag) {
7172
final List<Image> images = getDockerClient().listImagesCmd().exec();
7273
return images.stream()
7374
.map(Image::getRepoTags)
75+
.filter(Objects::nonNull)
7476
.map(Arrays::asList)
7577
.flatMap(Collection::stream)
7678
.anyMatch(repoTag -> repoTag.equals(tag));

0 commit comments

Comments
 (0)