From be9990db39dcd3d977f16daadf1cecdd9a93e0c7 Mon Sep 17 00:00:00 2001 From: "Emerle, Ryan" Date: Mon, 7 Feb 2022 14:52:58 -0500 Subject: [PATCH] Update `Dockerfile` for API - Fix issue with loading external JARs - Bump version to 0.10.5 --- build/docker/api/Dockerfile | 7 ++++--- version.sbt | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/build/docker/api/Dockerfile b/build/docker/api/Dockerfile index 379b7f36b..7063a9ab0 100644 --- a/build/docker/api/Dockerfile +++ b/build/docker/api/Dockerfile @@ -31,8 +31,9 @@ VOLUME ["/opt/vinyldns/lib_extra/", "/opt/vinyldns/conf/"] EXPOSE 9000 ENV JVM_OPTS="" -ENTRYPOINT ["/bin/bash", "-c", "java ${JVM_OPTS} -Dconfig.file=/opt/vinyldns/conf/application.conf \ +ENV INIT_SCRIPT="/bin/true" +ENTRYPOINT ["/bin/bash", "-c", "${INIT_SCRIPT} && java ${JVM_OPTS} -Dconfig.file=/opt/vinyldns/conf/application.conf \ -Dlogback.configurationFile=/opt/vinyldns/conf/logback.xml \ -Dvinyldns.version=$(cat /opt/vinyldns/version) \ - -cp /opt/vinyldns/lib_extra/* \ - -jar /opt/vinyldns/vinyldns-api.jar" ] + -cp /opt/vinyldns/lib_extra/*:/opt/vinyldns/vinyldns-api.jar \ + vinyldns.api.Boot" ] diff --git a/version.sbt b/version.sbt index 7ac0e7297..765375ec6 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -version in ThisBuild := "0.10.4" +version in ThisBuild := "0.10.5"