Skip to content

Commit

Permalink
Changed the paths of XSLT stylesheets used in entrypoint to be outsid…
Browse files Browse the repository at this point in the history
…e of `$CATALINA_HOME/webapps/ROOT/`
  • Loading branch information
namedgraph committed Sep 29, 2023
1 parent 56a6755 commit a0ea91a
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
16 changes: 8 additions & 8 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,6 @@ ENV SOURCE_COMMIT=$SOURCE_COMMIT

WORKDIR $CATALINA_HOME

# add XSLT stylesheet that makes changes to ROOT.xml

COPY platform/context.xsl conf/context.xsl

# add XSLT stylesheet that makes changes to web.xml

COPY platform/web.xsl /usr/local/tomcat/webapps/ROOT/WEB-INF/web.xsl

ENV CACHE_MODEL_LOADS=true

ENV STYLESHEET=static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/layout.xsl
Expand Down Expand Up @@ -126,6 +118,14 @@ RUN apt-get update --allow-releaseinfo-change && \
rm -rf webapps/* && \
rm -rf /var/lib/apt/lists/*

# add XSLT stylesheet that makes changes to ROOT.xml

COPY platform/context.xsl /var/linkeddatahub/xsl/context.xsl

# add XSLT stylesheet that makes changes to web.xml

COPY platform/web.xsl /var/linkeddatahub/xsl/web.xsl

# copy entrypoint

COPY platform/entrypoint.sh entrypoint.sh
Expand Down
4 changes: 2 additions & 2 deletions platform/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -775,7 +775,7 @@ transform="xsltproc \
$MAIL_PASSWORD_PARAM \
$GOOGLE_CLIENT_ID_PARAM \
$GOOGLE_CLIENT_SECRET_PARAM \
conf/context.xsl \
/var/linkeddatahub/xsl/context.xsl \
conf/Catalina/localhost/ROOT.xml"

eval "$transform"
Expand All @@ -789,7 +789,7 @@ fi
transform="xsltproc \
--output /usr/local/tomcat/webapps/ROOT/WEB-INF/web.xml \
$SERVLET_NAME_PARAM \
/usr/local/tomcat/webapps/ROOT/WEB-INF/web.xsl \
/var/linkeddatahub/xsl/web.xsl \
/usr/local/tomcat/webapps/ROOT/WEB-INF/web.xml"

# print Java's memory settings
Expand Down

0 comments on commit a0ea91a

Please sign in to comment.