Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-16484 Remove gpg from image, slimming it down some Mb (#1084)

Jan Høydahlefa2a46c7a39
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;