Skip to content

Commit 190b39c

Browse files
author
anurag.ag
committed
Uses fabricio docker maven plugin
1 parent b7c9dfb commit 190b39c

File tree

3 files changed

+25
-27
lines changed

3 files changed

+25
-27
lines changed

.github/workflows/master.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
echo "app_ver=$(mvn -B help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV
2727
-
2828
name: Build with Maven
29-
run: mvn -B clean integration-test package assembly:single docker:build
29+
run: mvn -B clean integration-test package docker:build
3030

3131
# github_release:
3232
-

pom.xml

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
<protobuf.version>3.19.1</protobuf.version>
2424
<testcontainers.version>1.16.2</testcontainers.version>
2525
<kafka-libs.version>6.1.4</kafka-libs.version>
26+
<docker.base.image>eclipse-temurin:11</docker.base.image>
2627
</properties>
2728

2829
<scm>
@@ -220,14 +221,6 @@
220221
</compilerArgs>
221222
</configuration>
222223
</plugin>
223-
<plugin>
224-
<artifactId>maven-assembly-plugin</artifactId>
225-
<configuration>
226-
<descriptors>
227-
<descriptor>src/main/assembly/bin.xml</descriptor>
228-
</descriptors>
229-
</configuration>
230-
</plugin>
231224
<plugin>
232225
<!-- Build an executable JAR -->
233226
<groupId>org.apache.maven.plugins</groupId>
@@ -243,24 +236,29 @@
243236
</configuration>
244237
</plugin>
245238
<plugin>
246-
<groupId>com.spotify</groupId>
239+
<groupId>io.fabric8</groupId>
247240
<artifactId>docker-maven-plugin</artifactId>
248-
<version>1.2.0</version>
241+
<version>0.40.1</version>
249242
<configuration>
250-
<imageName>obsidiandynamics/kafdrop</imageName>
251-
<forceTags>true</forceTags>
252-
<dockerDirectory>${project.build.directory}/docker-ready</dockerDirectory>
253-
<imageTags>
254-
<imageTag>${project.version}</imageTag>
255-
<imageTag>latest</imageTag>
256-
</imageTags>
257-
<resources>
258-
<resource>
259-
<targetPath>/</targetPath>
260-
<directory>${project.build.directory}</directory>
261-
<include>${project.build.finalName}-bin.tar.gz</include>
262-
</resource>
263-
</resources>
243+
<verbose>true</verbose>
244+
<sourceDirectory>src/main/assembly</sourceDirectory>
245+
<images>
246+
<image>
247+
<name>obsidiandynamics/kafdrop</name>
248+
<build>
249+
<tags>
250+
<tag>${project.version}</tag>
251+
<tag>latest</tag>
252+
</tags>
253+
<contextDir>${project.build.directory}/docker-ready</contextDir>
254+
<assembly>
255+
<name>${project.build.finalName}</name>
256+
<mode>tar</mode>
257+
<descriptor>bin.xml</descriptor>
258+
</assembly>
259+
</build>
260+
</image>
261+
</images>
264262
</configuration>
265263
</plugin>
266264
<plugin>

src/main/docker/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
FROM eclipse-temurin:11
1+
FROM ${docker.base.image}
22

33
ADD kafdrop.sh /
4-
ADD kafdrop*tar.gz /
4+
ADD ${project.build.finalName} /${project.build.finalName}
55

66
RUN chmod +x /kafdrop.sh
77

0 commit comments

Comments
 (0)