From e9a6609593b1bcc7465f8fc78c6e8430ab1364f9 Mon Sep 17 00:00:00 2001 From: bgamard Date: Wed, 12 Apr 2023 13:35:54 +0200 Subject: [PATCH] #668: jetty 11 deployment --- Dockerfile | 13 ++++++++++--- .../src/main/resources/META-INF/persistence.xml | 8 ++++---- docs.xml | 2 ++ 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9e300afe..993a74bf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -32,9 +32,16 @@ RUN apt-get update && \ tesseract-ocr-tur \ tesseract-ocr-ukr \ tesseract-ocr-vie && \ - apt-get clean && rm -rf /var/lib/apt/lists/* + apt-get clean && rm -rf /var/lib/apt/lists/* && \ + mkdir /app && \ + cd /app && \ + java -jar /opt/jetty/start.jar --add-modules=server,http,webapp,deploy -ADD docs.xml /opt/jetty/webapps/docs.xml -ADD docs-web/target/docs-web-*.war /opt/jetty/webapps/docs.war +ADD docs.xml /app/webapps/docs.xml +ADD docs-web/target/docs-web-*.war /app/webapps/docs.war ENV JAVA_OPTIONS -Xmx1g + +WORKDIR /app +CMD ["java", "-jar", "/opt/jetty/start.jar"] + diff --git a/docs-core/src/main/resources/META-INF/persistence.xml b/docs-core/src/main/resources/META-INF/persistence.xml index b62e7679..a4edc706 100644 --- a/docs-core/src/main/resources/META-INF/persistence.xml +++ b/docs-core/src/main/resources/META-INF/persistence.xml @@ -1,8 +1,8 @@ - + org.hibernate.jpa.HibernatePersistenceProvider diff --git a/docs.xml b/docs.xml index 01e310e5..e7ed8524 100644 --- a/docs.xml +++ b/docs.xml @@ -1,3 +1,5 @@ + + / /webapps/docs.war