You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ja...@apache.org on 2021/11/19 09:57:32 UTC
[solr] branch main updated: SOLR-15808: The jattach tool for Docker image is now installed with apt (#423)
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 3ec2fa0 SOLR-15808: The jattach tool for Docker image is now installed with apt (#423)
3ec2fa0 is described below
commit 3ec2fa054b3b3647dbaa407fd8cc28139759a505
Author: Jan Høydahl <ja...@users.noreply.github.com>
AuthorDate: Fri Nov 19 10:57:24 2021 +0100
SOLR-15808: The jattach tool for Docker image is now installed with apt (#423)
---
solr/CHANGES.txt | 2 ++
solr/docker/templates/Dockerfile.body.template | 7 ++-----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 0860ec4..bec177c 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -407,6 +407,8 @@ Other Changes
* SOLR-15784: Remove SolrJ dependency on commons-io. (Mike Drob)
+* SOLR-15808: [Docker] The jattach tool is now installed with apt (janhoy)
+
Bug Fixes
---------------------
* SOLR-14546: Fix for a relatively hard to hit issue in OverseerTaskProcessor that could lead to out of order execution
diff --git a/solr/docker/templates/Dockerfile.body.template b/solr/docker/templates/Dockerfile.body.template
index 1cb9a0e..82cdcdc 100644
--- a/solr/docker/templates/Dockerfile.body.template
+++ b/solr/docker/templates/Dockerfile.body.template
@@ -43,11 +43,8 @@ ARG GITHUB_URL=github.com
RUN set -ex; \
apt-get update; \
- apt-get -y install acl dirmngr lsof procps wget netcat gosu tini; \
- rm -rf /var/lib/apt/lists/*; \
- cd /usr/local/bin; wget -nv https://${GITHUB_URL}/apangin/jattach/releases/download/v1.5/jattach; chmod 755 jattach; \
- echo >jattach.sha512 "d8eedbb3e192a8596c08efedff99b9acf1075331e1747107c07cdb1718db2abe259ef168109e46bd4cf80d47d43028ff469f95e6ddcbdda4d7ffa73a20e852f9 jattach"; \
- sha512sum -c jattach.sha512; rm jattach.sha512
+ apt-get -y install acl dirmngr lsof procps wget netcat gosu tini jattach; \
+ rm -rf /var/lib/apt/lists/*;
ENV SOLR_USER="solr" \
SOLR_UID="8983" \