Skip to content

Commit 3185e59

Browse files
author
Vladimir Kotal
committed
store webapp configuration under /opengrok/etc
1 parent 5db1043 commit 3185e59

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ LABEL maintainer "[email protected]"
1515

1616
# prepare OpenGrok binaries and directories
1717
COPY --from=fetcher opengrok.tar.gz /opengrok.tar.gz
18-
RUN mkdir -p /opengrok /var/opengrok/etc /opengrok/data /opengrok/src && \
18+
RUN mkdir -p /opengrok /opengrok/etc /opengrok/data /opengrok/src && \
1919
tar -zxvf /opengrok.tar.gz -C /opengrok --strip-components 1 && \
2020
rm -f /opengrok.tar.gz
2121

@@ -43,7 +43,8 @@ ENV CLASSPATH /usr/local/tomcat/bin/bootstrap.jar:/usr/local/tomcat/bin/tomcat-j
4343

4444
# custom deployment to / with redirect from /source
4545
RUN rm -rf /usr/local/tomcat/webapps/* && \
46-
opengrok-deploy /opengrok/lib/source.war /usr/local/tomcat/webapps/ROOT.war && \
46+
opengrok-deploy -c /opengrok/etc/configuration.xml \
47+
/opengrok/lib/source.war /usr/local/tomcat/webapps/ROOT.war && \
4748
mkdir "/usr/local/tomcat/webapps/source" && \
4849
echo '<% response.sendRedirect("/"); %>' > "/usr/local/tomcat/webapps/source/index.jsp"
4950

docker/index.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ opengrok-indexer \
2424
-s /opengrok/src \
2525
-d /opengrok/data \
2626
--leadingWildCards on \
27-
-W /var/opengrok/etc/configuration.xml \
27+
-W /opengrok/etc/configuration.xml \
2828
-U "$URI" \
2929
$OPS \
3030
$INDEXER_OPT "$@"

0 commit comments

Comments
 (0)