build: debian:bookworm-slim for native and improve commandline packag…

…ing (#5) Signed-off-by: tison <wander4096@gmail.com>
korandoru · Jan 3, 2023 · 71aa438 · 71aa438
1 parent 5da393c
commit 71aa438
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -18,5 +18,5 @@ COPY . .
 RUN ./mvnw -B -ntp clean package -DskipTests
 
 FROM eclipse-temurin:17-jre
-COPY --from=build /build/distribution/commandline/target/commandline-1.0.0-SNAPSHOT.jar /bin/hawkeye
+COPY --from=build /build/distribution/commandline/target/hawkeye.jar /bin/hawkeye
 ENTRYPOINT ["/bin/hawkeye"]
diff --git a/Dockerfile.native b/Dockerfile.native
@@ -17,6 +17,6 @@ WORKDIR /build
 COPY . .
 RUN ./mvnw -B -ntp clean package -DskipTests -Pnative -DonlyNativeDistro
 
-FROM ubuntu:jammy
+FROM debian:bookworm-slim
 COPY --from=build /build/distribution/native/target/hawkeye-native /bin/
 ENTRYPOINT ["/bin/hawkeye-native"]
diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ Simple license header checker and formatter, in multiple distribution forms.
 ./mvnw clean install -DskipTests
 
 # Run
-./distribution/commandline/target/hawkeye-<version>-bin/hawkeye-<version>/hawkeye
+./distribution/commandline/target/hawkeye.jar
 ```
 
 ### Native Image

diff --git a/distribution/commandline/pom.xml b/distribution/commandline/pom.xml
@@ -53,6 +53,9 @@
  <goals>
  <goal>repackage</goal>
  </goals>
+ <configuration>
+ <finalName>hawkeye</finalName>
+ </configuration>
  </execution>
  </executions>
  <configuration>

diff --git a/distribution/commandline/src/assemble/bin.xml b/distribution/commandline/src/assemble/bin.xml
@@ -25,7 +25,7 @@
  </formats>
  <files>
  <file>
- <source>${project.build.directory}/commandline-${project.version}.jar</source>
+ <source>${project.build.directory}/hawkeye.jar</source>
  <destName>hawkeye</destName>
  <outputDirectory>.</outputDirectory>
  <fileMode>755</fileMode>