[solr] branch branch_9x updated: SOLR-16484 Remove gpg from image, slimming it down some Mb (#1084)

[janhoy]

This is an automated email from the ASF dual-hosted git repository.

janhoy pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git


The following commit(s) were added to refs/heads/branch_9x by this push:
     new b1965cc6dc7 SOLR-16484 Remove gpg from image, slimming it down some Mb 
(#1084)
b1965cc6dc7 is described below

commit b1965cc6dc7abd75c08d2fc39a5109317f1afe9f
Author: Jan Høydahl <jan...@users.noreply.github.com>
AuthorDate: Thu Oct 20 20:30:23 2022 +0200

    SOLR-16484 Remove gpg from image, slimming it down some Mb (#1084)
---
 solr/docker/templates/Dockerfile.body.template            | 2 +-
 solr/docker/templates/Dockerfile.official.header.template | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/solr/docker/templates/Dockerfile.body.template 
b/solr/docker/templates/Dockerfile.body.template
index 4177aa4b014..50e2518368e 100644
--- a/solr/docker/templates/Dockerfile.body.template
+++ b/solr/docker/templates/Dockerfile.body.template
@@ -71,7 +71,7 @@ RUN set -ex; \
 
 RUN set -ex; \
     apt-get update; \
-    apt-get -y install acl dirmngr lsof procps wget netcat gosu tini jattach; \
+    apt-get -y install acl lsof procps wget netcat gosu tini jattach; \
     rm -rf /var/lib/apt/lists/*;
 
 VOLUME /var/solr
diff --git a/solr/docker/templates/Dockerfile.official.header.template 
b/solr/docker/templates/Dockerfile.official.header.template
index 413f5112f2f..c1e99133c94 100644
--- a/solr/docker/templates/Dockerfile.official.header.template
+++ b/solr/docker/templates/Dockerfile.official.header.template
@@ -85,5 +85,6 @@ RUN set -ex; \
   { command -v gpgconf; gpgconf --kill all || :; }; \
   rm -r "$GNUPGHOME"; \
   tar -C /opt --extract --preserve-permissions --file 
"/opt/solr-$SOLR_VERSION.tgz"; \
-  rm "/opt/solr-$SOLR_VERSION.tgz"*;
+  rm "/opt/solr-$SOLR_VERSION.tgz"*; \
+  apt-get -y remove gpg dirmngr && apt-get -y autoremove;