Skip to content

Commit 53d43ee

Browse files
nodecesrinath-ctds
authored andcommitted
[fix][build] Fix skipTag and use explicit tag for image name (apache#24168)
Signed-off-by: Zixuan Liu <nodeces@gmail.com> (cherry picked from commit eb2020c) (cherry picked from commit 876ece4)
1 parent c8cfcd9 commit 53d43ee

File tree

5 files changed

+8
-14
lines changed

5 files changed

+8
-14
lines changed

docker/pulsar-all/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,11 +154,11 @@
154154
<configuration>
155155
<images>
156156
<image>
157-
<name>${docker.organization}/${docker.image}-all</name>
157+
<name>${docker.organization}/${docker.image}-all:${docker.tag}</name>
158158
<build>
159159
<contextDir>${project.basedir}</contextDir>
160+
<skipTag>${docker.skip.tag}</skipTag>
160161
<tags>
161-
<tag>${docker.tag}</tag>
162162
<tag>${project.version}-${git.commit.id.abbrev}</tag>
163163
</tags>
164164
<args>

docker/pulsar/pom.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
<configuration>
7878
<images>
7979
<image>
80-
<name>${docker.organization}/${docker.image}</name>
80+
<name>${docker.organization}/${docker.image}:${docker.tag}</name>
8181
<build>
8282
<args>
8383
<PULSAR_TARBALL>target/pulsar-server-distribution-${project.version}-bin.tar.gz</PULSAR_TARBALL>
@@ -86,8 +86,8 @@
8686
<IMAGE_JDK_MAJOR_VERSION>${IMAGE_JDK_MAJOR_VERSION}</IMAGE_JDK_MAJOR_VERSION>
8787
</args>
8888
<contextDir>${project.basedir}</contextDir>
89+
<skipTag>${docker.skip.tag}</skipTag>
8990
<tags>
90-
<tag>${docker.tag}</tag>
9191
<tag>${project.version}-${git.commit.id.abbrev}</tag>
9292
</tags>
9393
<buildx>
@@ -127,6 +127,7 @@
127127
<id>docker-push</id>
128128
<properties>
129129
<docker.skip.push>false</docker.skip.push>
130+
<docker.skip.tag>true</docker.skip.tag>
130131
<docker.platforms>linux/amd64,linux/arm64</docker.platforms>
131132
</properties>
132133
</profile>

pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ flexible messaging model and an intuitive client API.</description>
102102
-->
103103
<docker.platforms></docker.platforms>
104104
<docker.skip.push>true</docker.skip.push>
105+
<docker.skip.tag>false</docker.skip.tag>
105106

106107
<!-- required for running tests on JDK11+ -->
107108
<test.additional.args>

tests/docker-images/java-test-image/pom.xml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -148,16 +148,12 @@
148148
<configuration>
149149
<images>
150150
<image>
151-
<name>${docker.organization}/java-test-image</name>
151+
<name>${docker.organization}/java-test-image:${docker.tag}</name>
152152
<build>
153153
<args>
154154
<PULSAR_IMAGE>${docker.organization}/${docker.image}:${project.version}-${git.commit.id.abbrev}</PULSAR_IMAGE>
155155
</args>
156156
<contextDir>${project.basedir}</contextDir>
157-
<tags>
158-
<tag>${docker.tag}</tag>
159-
<tag>${project.version}</tag>
160-
</tags>
161157
<noCache>true</noCache>
162158
</build>
163159
</image>

tests/docker-images/latest-version-image/pom.xml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -152,16 +152,12 @@
152152
<configuration>
153153
<images>
154154
<image>
155-
<name>${docker.organization}/${docker.image}-test-latest-version</name>
155+
<name>${docker.organization}/${docker.image}-test-latest-version:${docker.tag}</name>
156156
<build>
157157
<contextDir>${project.basedir}</contextDir>
158158
<args>
159159
<PULSAR_ALL_IMAGE>${docker.organization}/${docker.image}-all:${project.version}-${git.commit.id.abbrev}</PULSAR_ALL_IMAGE>
160160
</args>
161-
<tags>
162-
<tag>${docker.tag}</tag>
163-
<tag>${project.version}</tag>
164-
</tags>
165161
<noCache>true</noCache>
166162
<buildx>
167163
<platforms>

0 commit comments

Comments
 (0)