This is an automated email from the ASF dual-hosted git repository.
janhoy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/main by this push:
new f843282 Simplify rm statement, make sure deletion works, remove
redundant solr-core jar (#494)
f843282 is described below
commit f8432821586e203b2a30ecb450ace2790d20d445
Author: Jan Høydahl <[email protected]>
AuthorDate: Tue Jan 4 16:18:08 2022 +0100
Simplify rm statement, make sure deletion works, remove redundant solr-core
jar (#494)
---
solr/bin/post | 2 +-
solr/docker/templates/Dockerfile.body.template | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/solr/bin/post b/solr/bin/post
index 25c30ea..dd9407e 100755
--- a/solr/bin/post
+++ b/solr/bin/post
@@ -52,7 +52,7 @@ fi
# ===== post specific code
-TOOL_JAR=("$SOLR_TIP/dist"/solr-core-*.jar)
+TOOL_JAR=("$SOLR_TIP/server/solr-webapp/webapp/WEB-INF/lib"/solr-core-*.jar)
function print_usage() {
echo ""
diff --git a/solr/docker/templates/Dockerfile.body.template
b/solr/docker/templates/Dockerfile.body.template
index df6942a..4aa7d3c 100644
--- a/solr/docker/templates/Dockerfile.body.template
+++ b/solr/docker/templates/Dockerfile.body.template
@@ -30,7 +30,7 @@
# TODO; arguably these permissions should have been set correctly previously
in the TAR
RUN set -ex; \
(cd /opt; ln -s solr-*/ solr); \
- rm -Rf /opt/solr/docs /opt/solr/docker/Dockerfile*
/opt/solr/dist/{solr-solrj-*.jar,solrj-lib}; \
+ rm -Rf /opt/solr/docs /opt/solr/docker/Dockerfile*
/opt/solr/dist/solr-solrj-*.jar /opt/solr/dist/solrj-lib
/opt/solr/dist/solr-core-*.jar; \
find /opt/solr/ -type d -print0 | xargs -0 chmod 0755; \
find /opt/solr/ -type f -print0 | xargs -0 chmod 0644; \
chmod -R 0755 /opt/solr/docker/scripts /opt/solr/bin
/opt/solr/contrib/prometheus-exporter/bin/solr-exporter
/opt/solr/server/scripts/cloud-scripts
