This is an automated email from the ASF dual-hosted git repository.
adutra pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/polaris.git
The following commit(s) were added to refs/heads/main by this push:
new 94e267609 Admin tool: fix Dockerfile.jvm (#1256)
94e267609 is described below
commit 94e267609b12188951f5945e602e256926700b84
Author: Alexandre Dutra <[email protected]>
AuthorDate: Wed Mar 26 13:34:40 2025 +0100
Admin tool: fix Dockerfile.jvm (#1256)
---
quarkus/admin/src/main/docker/Dockerfile.jvm | 11 +++++++----
.../java/org/apache/polaris/admintool/PolarisAdminTool.java | 2 +-
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/quarkus/admin/src/main/docker/Dockerfile.jvm
b/quarkus/admin/src/main/docker/Dockerfile.jvm
index 8537fa5a4..ffb679ce3 100644
--- a/quarkus/admin/src/main/docker/Dockerfile.jvm
+++ b/quarkus/admin/src/main/docker/Dockerfile.jvm
@@ -31,12 +31,15 @@ RUN groupadd --gid 10001 polaris \
&& chown -R polaris:polaris /deployments
USER polaris
-WORKDIR /deployments
+WORKDIR /home/polaris
ENV USER=polaris
ENV UID=10000
ENV HOME=/home/polaris
-ENV PWD=/deployments
-COPY --chown=polaris:polaris build/*-runner.jar
/deployments/polaris-server-admin-tool.jar
+# We make four distinct layers so if there are application changes the library
layers can be re-used
+COPY --chown=polaris:polaris build/quarkus-app/lib/ /deployments/lib/
+COPY --chown=polaris:polaris build/quarkus-app/quarkus-run.jar
/deployments/polaris-admin-tool.jar
+COPY --chown=polaris:polaris build/quarkus-app/app/ /deployments/app/
+COPY --chown=polaris:polaris build/quarkus-app/quarkus/ /deployments/quarkus/
-ENTRYPOINT [ "java", "-jar", "/deployments/polaris-server-admin-tool.jar" ]
\ No newline at end of file
+ENTRYPOINT [ "java", "-jar", "/deployments/polaris-admin-tool.jar" ]
\ No newline at end of file
diff --git
a/quarkus/admin/src/main/java/org/apache/polaris/admintool/PolarisAdminTool.java
b/quarkus/admin/src/main/java/org/apache/polaris/admintool/PolarisAdminTool.java
index e26aa4925..50725af50 100644
---
a/quarkus/admin/src/main/java/org/apache/polaris/admintool/PolarisAdminTool.java
+++
b/quarkus/admin/src/main/java/org/apache/polaris/admintool/PolarisAdminTool.java
@@ -26,7 +26,7 @@ import picocli.CommandLine.HelpCommand;
@TopCommand
@Command(
- name = "polaris-quarkus-admin-runner.jar",
+ name = "polaris-admin-tool.jar",
mixinStandardHelpOptions = true,
versionProvider = PolarisVersionProvider.class,
description = "Polaris Admin Tool",
