Merge pull request #400 from chgl/fixed-tomcat-wrong-war-dir
fixed directory of the .war in tomcat-based image
This commit is contained in:
@@ -21,7 +21,6 @@ RUN mkdir /app && cp /tmp/hapi-fhir-jpaserver-starter/target/ROOT.war /app/main.
|
|||||||
FROM bitnami/tomcat:9.0 as tomcat
|
FROM bitnami/tomcat:9.0 as tomcat
|
||||||
|
|
||||||
RUN rm -rf /opt/bitnami/tomcat/webapps/ROOT && \
|
RUN rm -rf /opt/bitnami/tomcat/webapps/ROOT && \
|
||||||
rm -rf /opt/bitnami/tomcat/webapps_default/ROOT && \
|
|
||||||
mkdir -p /opt/bitnami/hapi/data/hapi/lucenefiles && \
|
mkdir -p /opt/bitnami/hapi/data/hapi/lucenefiles && \
|
||||||
chmod 775 /opt/bitnami/hapi/data/hapi/lucenefiles
|
chmod 775 /opt/bitnami/hapi/data/hapi/lucenefiles
|
||||||
|
|
||||||
@@ -31,7 +30,7 @@ USER 1001
|
|||||||
|
|
||||||
COPY --chown=1001:1001 catalina.properties /opt/bitnami/tomcat/conf/catalina.properties
|
COPY --chown=1001:1001 catalina.properties /opt/bitnami/tomcat/conf/catalina.properties
|
||||||
COPY --chown=1001:1001 server.xml /opt/bitnami/tomcat/conf/server.xml
|
COPY --chown=1001:1001 server.xml /opt/bitnami/tomcat/conf/server.xml
|
||||||
COPY --from=build-hapi --chown=1001:1001 /tmp/hapi-fhir-jpaserver-starter/target/ROOT.war /opt/bitnami/tomcat/webapps_default/ROOT.war
|
COPY --from=build-hapi --chown=1001:1001 /tmp/hapi-fhir-jpaserver-starter/target/ROOT.war /opt/bitnami/tomcat/webapps/ROOT.war
|
||||||
COPY --from=build-hapi --chown=1001:1001 /tmp/hapi-fhir-jpaserver-starter/opentelemetry-javaagent.jar /app
|
COPY --from=build-hapi --chown=1001:1001 /tmp/hapi-fhir-jpaserver-starter/opentelemetry-javaagent.jar /app
|
||||||
|
|
||||||
ENV ALLOW_EMPTY_PASSWORD=yes
|
ENV ALLOW_EMPTY_PASSWORD=yes
|
||||||
|
|||||||
Reference in New Issue
Block a user