Skip to content

[improve][build] Use project version with commit hash as docker tag #24325

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

Open
nodece wants to merge 5 commits into
base: master
Choose a base branch
from
Open

[improve][build] Use project version with commit hash as docker tag #24325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e3c9242
[improve][build] Use project version with commit hash as docker tag
nodece May 21, 2025
5d85fd3
Remove git-commit-id-no-git profile
nodece May 21, 2025
17550e5
Add comment for git.commit.id.abbrev
nodece May 21, 2025
f0a4704
Move git-commit-id-no-git to the root project
nodece Jun 4, 2025
e2432b3
Fix missing check
nodece Jun 4, 2025
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
17 changes: 1 addition & 16 deletions docker/pulsar-all/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,17 +66,6 @@
</dependencies>

<profiles>
<profile>
<id>git-commit-id-no-git</id>
<activation>
<file>
<missing>${basedir}/../../.git</missing>
</file>
</activation>
<properties>
<git.commit.id.abbrev>no-git</git.commit.id.abbrev>
</properties>
</profile>
<profile>
<id>docker</id>
<!-- include the docker image only when docker profile is active -->
Expand Down Expand Up @@ -157,14 +146,10 @@
<name>${docker.organization}/${docker.image}-all:${docker.tag}</name>
<build>
<contextDir>${project.basedir}</contextDir>
<skipTag>${docker.skip.tag}</skipTag>
<tags>
<tag>${project.version}-${git.commit.id.abbrev}</tag>
</tags>
<args>
<PULSAR_IO_DIR>target/apache-pulsar-io-connectors-${project.version}-bin</PULSAR_IO_DIR>
<PULSAR_OFFLOADER_TARBALL>target/pulsar-offloader-distribution-${project.version}-bin.tar.gz</PULSAR_OFFLOADER_TARBALL>
<PULSAR_IMAGE>${docker.organization}/${docker.image}:${project.version}-${git.commit.id.abbrev}</PULSAR_IMAGE>
<PULSAR_IMAGE>${docker.organization}/${docker.image}:${docker.tag}</PULSAR_IMAGE>
<PULSAR_IO_KINESIS_KPL_IMAGE>${PULSAR_IO_KINESIS_KPL_IMAGE}</PULSAR_IO_KINESIS_KPL_IMAGE>
</args>
<buildx>
Expand Down
16 changes: 0 additions & 16 deletions docker/pulsar/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,17 +48,6 @@
</dependencies>

<profiles>
<profile>
<id>git-commit-id-no-git</id>
<activation>
<file>
<missing>${basedir}/../../.git</missing>
</file>
</activation>
<properties>
<git.commit.id.abbrev>no-git</git.commit.id.abbrev>
</properties>
</profile>
<profile>
<id>docker</id>
<build>
Expand Down Expand Up @@ -86,10 +75,6 @@
<IMAGE_JDK_MAJOR_VERSION>${IMAGE_JDK_MAJOR_VERSION}</IMAGE_JDK_MAJOR_VERSION>
</args>
<contextDir>${project.basedir}</contextDir>
<skipTag>${docker.skip.tag}</skipTag>
<tags>
<tag>${project.version}-${git.commit.id.abbrev}</tag>
</tags>
<buildx>
<platforms>
<platform>${docker.platforms}</platform>
Expand Down Expand Up @@ -127,7 +112,6 @@
<id>docker-push</id>
<properties>
<docker.skip.push>false</docker.skip.push>
<docker.skip.tag>true</docker.skip.tag>
<docker.platforms>linux/amd64,linux/arm64</docker.platforms>
</properties>
</profile>
Expand Down
15 changes: 13 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@ flexible messaging model and an intuitive client API.</description>
-->
<docker.platforms></docker.platforms>
<docker.skip.push>true</docker.skip.push>
<docker.skip.tag>false</docker.skip.tag>

<!-- required for running tests on JDK11+ -->
<test.additional.args>
Expand Down Expand Up @@ -167,7 +166,8 @@ flexible messaging model and an intuitive client API.</description>
<surefire.shutdown>kill</surefire.shutdown>
<docker.organization>apachepulsar</docker.organization>
<docker.image>pulsar</docker.image>
<docker.tag>latest</docker.tag>
<!-- git.commit.id.abbrev will be injected by git-commit-id-plugin-->
<docker.tag>${project.version}-${git.commit.id.abbrev}</docker.tag>
<skipSourceReleaseAssembly>false</skipSourceReleaseAssembly>
<skipBuildDistribution>false</skipBuildDistribution>
<skipDeployConnector>false</skipDeployConnector>
Expand Down Expand Up @@ -2410,6 +2410,17 @@ flexible messaging model and an intuitive client API.</description>
</build>

<profiles>
<profile>
<id>git-commit-id-no-git</id>
<activation>
<file>
<missing>${basedir}/.git</missing>
</file>
</activation>
<properties>
<docker.tag>${project.version}-no-git</docker.tag>
</properties>
</profile>
<profile>
<!-- used for running integration tests on Java 8 -->
<id>integration-test-java8</id>
Expand Down
3 changes: 1 addition & 2 deletions tests/docker-images/java-test-image/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,15 +152,14 @@
<phase>package</phase>
<goals>
<goal>build</goal>
<goal>tag</goal>
</goals>
<configuration>
<images>
<image>
<name>${docker.organization}/java-test-image:${docker.tag}</name>
<build>
<args>
<PULSAR_IMAGE>${docker.organization}/${docker.image}:${project.version}-${git.commit.id.abbrev}</PULSAR_IMAGE>
<PULSAR_IMAGE>${docker.organization}/${docker.image}:${docker.tag}</PULSAR_IMAGE>
</args>
<contextDir>${project.basedir}</contextDir>
<noCache>true</noCache>
Expand Down
3 changes: 1 addition & 2 deletions tests/docker-images/latest-version-image/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,6 @@
<phase>package</phase>
<goals>
<goal>build</goal>
<goal>tag</goal>
</goals>
<configuration>
<images>
Expand All @@ -165,7 +164,7 @@
<build>
<contextDir>${project.basedir}</contextDir>
<args>
<PULSAR_ALL_IMAGE>${docker.organization}/${docker.image}-all:${project.version}-${git.commit.id.abbrev}</PULSAR_ALL_IMAGE>
<PULSAR_ALL_IMAGE>${docker.organization}/${docker.image}-all:${docker.tag}</PULSAR_ALL_IMAGE>
</args>
<noCache>true</noCache>
<buildx>
Expand Down
Loading