Skip to content

Commit

Permalink
added modelfilter.jar ceskaexpedice/kramerius#406
Browse files Browse the repository at this point in the history
  • Loading branch information
jirikrepl committed Aug 31, 2016
1 parent 0745056 commit aa0f1d0
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 1 deletion.
4 changes: 3 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ LABEL io.k8s.description="Kramerius" \
io.openshift.tags="builder,kramerius" \
io.openshift.s2i.scripts-url="image:///usr/libexec/s2i"

RUN INSTALL_PKGS="tar java-1.8.0-openjdk java-1.8.0-openjdk-devel" && \
RUN INSTALL_PKGS="tar java-1.8.0-openjdk java-1.8.0-openjdk-devel zip" && \
yum install -y --enablerepo=centosplus $INSTALL_PKGS && \
rpm -V $INSTALL_PKGS && \
yum clean all -y && \
Expand Down Expand Up @@ -58,6 +58,8 @@ RUN curl -sL "$JDBC_DRIVER_DOWNLOAD_URL" -o $CATALINA_HOME/lib/postgresql-9.4.12
ADD search.xml $CATALINA_HOME/conf/Catalina/localhost/search.xml
ADD web.xml $CATALINA_HOME/conf/web.xml

ADD modelfilter.jar .

# Kramerius auth
ENV JAAS_CONFIG=$CATALINA_HOME/conf/jaas.config
ADD jaas.conf $CATALINA_HOME/conf/jaas.config
Expand Down
4 changes: 4 additions & 0 deletions assemble
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ restore_saved_artifacts
pushd $LOCAL_SOURCE_DIR &> /dev/null
gradle patchDistTar --info -exclude-task gitcall -exclude-task infofile

mkdir -p WEB-INF/lib
cp $CATALINA_HOME/modelfilter.jar WEB-INF/lib
zip ./search/build/libs/search.war WEB-INF/lib/modelfilter.jar

mv ./search/build/libs/search.war $DEPLOY_DIR
mv ./client/build/libs/client.war $DEPLOY_DIR
mv ./security-core/build/libs/security-core.jar $CATALINA_HOME/lib/
Expand Down
Binary file added modelfilter.jar
Binary file not shown.

0 comments on commit aa0f1d0

Please sign in to comment.