Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Solr to 6.4.1 #2625

Merged
merged 1 commit into from
Feb 6, 2017
Merged

Update Solr to 6.4.1 #2625

merged 1 commit into from
Feb 6, 2017

Conversation

@tianon
Copy link
Member

tianon commented Feb 6, 2017

warning: insecure protocol git:// detected: git://github.com/docker-solr/docker-solr
diff --git a/solr_alpine/Dockerfile b/solr_alpine/Dockerfile
index 51a89b1..c4d264c 100644
--- a/solr_alpine/Dockerfile
+++ b/solr_alpine/Dockerfile
@@ -25,13 +25,13 @@ ENV SOLR_UID 8983
 RUN addgroup -S -g $SOLR_UID $SOLR_USER && \
   adduser -S -u $SOLR_UID -g $SOLR_USER $SOLR_USER
 
-ENV SOLR_KEY 478EEF7066AD843EC4812769707B7D9F6FDB8105
+ENV SOLR_KEY E6E21FFCDCEA14C95910EA65051A0FAF76BC6507
 RUN gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$SOLR_KEY"
 ENV GPG_KEYSERVER ${GPG_KEYSERVER:-hkp://ha.pool.sks-keyservers.net}
 RUN gpg --keyserver "$GPG_KEYSERVER" --recv-keys "$SOLR_KEY"
 
-ENV SOLR_VERSION 6.4.0
-ENV SOLR_SHA256 1213ae09023058ea1cbd971a1b585f891fb63fa76e128611031bfc28c749b502
+ENV SOLR_VERSION 6.4.1
+ENV SOLR_SHA256 ebce206dd4a66600384ccdd9a604536135594ce4c24814bbd5a3e8a8ec1efbb9
 ENV SOLR_URL ${SOLR_DOWNLOAD_SERVER:-https://archive.apache.org/dist/lucene/solr}/$SOLR_VERSION/solr-$SOLR_VERSION.tgz
 
 RUN mkdir -p /opt/solr && \
diff --git a/solr_latest/Dockerfile b/solr_latest/Dockerfile
index c6a0c8d..8bfcfe3 100644
--- a/solr_latest/Dockerfile
+++ b/solr_latest/Dockerfile
@@ -20,12 +20,12 @@ ENV SOLR_UID 8983
 RUN groupadd -r -g $SOLR_UID $SOLR_USER && \
   useradd -r -u $SOLR_UID -g $SOLR_USER $SOLR_USER
 
-ENV SOLR_KEY 478EEF7066AD843EC4812769707B7D9F6FDB8105
+ENV SOLR_KEY E6E21FFCDCEA14C95910EA65051A0FAF76BC6507
 ENV GPG_KEYSERVER ${GPG_KEYSERVER:-hkp://ha.pool.sks-keyservers.net}
 RUN gpg --keyserver "$GPG_KEYSERVER" --recv-keys "$SOLR_KEY"
 
-ENV SOLR_VERSION 6.4.0
-ENV SOLR_SHA256 1213ae09023058ea1cbd971a1b585f891fb63fa76e128611031bfc28c749b502
+ENV SOLR_VERSION 6.4.1
+ENV SOLR_SHA256 ebce206dd4a66600384ccdd9a604536135594ce4c24814bbd5a3e8a8ec1efbb9
 ENV SOLR_URL ${SOLR_DOWNLOAD_SERVER:-https://archive.apache.org/dist/lucene/solr}/$SOLR_VERSION/solr-$SOLR_VERSION.tgz
 
 RUN mkdir -p /opt/solr && \

@tianon
Copy link
Member

tianon commented Feb 6, 2017

LGTM

Build test of #2625; e3c33db (solr):
warning: insecure protocol git:// detected: git://github.com/docker-solr/docker-solr

$ bashbrew build solr:5.5.3
Using bashbrew/cache:7979920f4b2a288df942c7f700d7784551bfaab857c4d30cdd6c98e94680a20c (solr:5.5.3)
Tagging solr:5.5.3
Tagging solr:5.5
Tagging solr:5

$ test/run.sh solr:5.5.3
testing solr:5.5.3
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build solr:5.5.3-alpine
Using bashbrew/cache:d2f2ee12df487a3864d937e982a45e97ef5faa54d06877bdacc31036815144e0 (solr:5.5.3-alpine)
Tagging solr:5.5.3-alpine
Tagging solr:5.5-alpine
Tagging solr:5-alpine

$ test/run.sh solr:5.5.3-alpine
testing solr:5.5.3-alpine
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build solr:6.3.0
Using bashbrew/cache:971fa5b0fb83de602d1c0b977e050a22fbb5695690aa8e2950b2fc365e94195c (solr:6.3.0)
Tagging solr:6.3.0
Tagging solr:6.3

$ test/run.sh solr:6.3.0
testing solr:6.3.0
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build solr:6.3.0-alpine
Using bashbrew/cache:a0feed3033e8b972600f6abe8aac20ed1b80d379e9895593c31f4d86805f009a (solr:6.3.0-alpine)
Tagging solr:6.3.0-alpine
Tagging solr:6.3-alpine

$ test/run.sh solr:6.3.0-alpine
testing solr:6.3.0-alpine
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build solr:6.4.1
Using bashbrew/cache:a17b7b07b89a3df5c3bb4e78ea70a44fb19892e1824249a3fc563011df48fe9f (solr:6.4.1)
Tagging solr:6.4.1
Tagging solr:6.4
Tagging solr:6
Tagging solr:latest

$ test/run.sh solr:6.4.1
testing solr:6.4.1
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build solr:6.4.1-alpine
Using bashbrew/cache:fa1896ffcbef67b62e2bd9278ebde328d42a059bc8e39aafa3094997a09c6bb5 (solr:6.4.1-alpine)
Tagging solr:6.4.1-alpine
Tagging solr:6.4-alpine
Tagging solr:6-alpine
Tagging solr:alpine

$ test/run.sh solr:6.4.1-alpine
testing solr:6.4.1-alpine
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed

@tianon tianon merged commit 869f76b into docker-library:master Feb 6, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants