fix after merge

This commit is contained in:
kochetkov 2024-09-02 09:58:05 +03:00
parent d0322684f0
commit 38cffe4a7e
3 changed files with 20 additions and 20 deletions

View file

@ -1,5 +1,5 @@
ARG BUILDER_IMAGE=registry.altlinux.org/basealt/altsp:c10f1
ARG RUNTIME_IMAGE=tomee:8.0.16-jre17-webprofile
ARG RUNTIME_IMAGE=tomcat:9.0.93-jre17
FROM $BUILDER_IMAGE AS builder
@ -26,10 +26,10 @@ RUN mkdir -p $HOME/.m2 \
FROM $RUNTIME_IMAGE
ARG ADMIN_PASSWORD=Secr3t
COPY config/tomcat/tomee /usr/local/tomee
COPY config/tomcat/tomcat /usr/local/tomcat
RUN rm -rf /usr/local/tomee/webapps/ROOT \
&& cat /usr/local/tomee/conf/webbpm.properties >> /usr/local/tomee/conf/catalina.properties \
&& sed -i -r "s/<must-be-changed>/$ADMIN_PASSWORD/g" /usr/local/tomee/conf/tomcat-users.xml
RUN rm -rf /usr/local/tomcat/webapps/ROOT \
&& cat /usr/local/tomcat/conf/webbpm.properties >> /usr/local/tomcat/conf/catalina.properties \
&& sed -i -r "s/<must-be-changed>/$ADMIN_PASSWORD/g" /usr/local/tomcat/conf/tomcat-users.xml
COPY --from=builder /app/backend/target/dashboard*.war /usr/local/tomee/webapps/dashboard.war
COPY --from=builder /app/backend/target/dashboard*.war /usr/local/tomcat/webapps/dashboard.war