Skip to content

Conversation

@vchendrix
Copy link
Member

No longer supports embedded solr in Metacat<2.13.0
Adds ESS-DIVE custom skins to image

  • These were ported from ess-dive-catalog. This saves the extra step of deployments
    Metacat waits for solr to startup

NOTE: version that builds for Metacat 2.12.3 has been tagged (Metacat-2.12.3)

Supports Issue ess-dive/ess-dive-project#99

@vchendrix vchendrix requested review from helbashandy and mamelara May 5, 2021 19:57
@vchendrix vchendrix self-assigned this May 5, 2021
Copy link
Contributor

@helbashandy helbashandy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking great, I had a comment for a potential improvement on the Solr versioning.

build.sh Outdated
unzip "$DIR/metacat-index.war" "WEB-INF/classes/solr-home/conf/*" -d "$DIR/solr"

# create the docker tag
DOCKER_TAG="${VERSION}-8.4.1-p$(cd $DIR; git rev-list HEAD --count)"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if this could be parsed from here instead of hard coding the Solr version.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Assuming that the same file exists in the .war file.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the version of solr is in the xml file solrconfig.xml. We could probably parse it out. Not sure if we want to do that right now though. We probably want to be very thoughtful about upgrading to a new version of solr. This would be a good discussion topic for down the road. Feel free to add an issue ticket labeled discussion.

build.sh Outdated
fi

echo "docker build ${DOCKER_BUILD_OPTIONS} -f $DIR/solr/Dockerfile -t ${IMAGE_NAME} $BUILD_ARGS $DIR/"
docker pull solr:8.4.1
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as above.

solr/Dockerfile Outdated
@@ -0,0 +1,5 @@
FROM solr:8.4.1
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as above.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think for now let's keep it this way. See comment above.

@vchendrix vchendrix force-pushed the issue-project-99-solr-service branch 2 times, most recently from d2b2fcd to d9adda4 Compare May 20, 2021 00:41
@vchendrix vchendrix force-pushed the issue-project-99-solr-service branch 2 times, most recently from 8457d61 to d75ac25 Compare June 22, 2021 22:44
Co-author <vchendrix>

No longer supports embedded solr in Metacat<2.13.0
Adds ESS-DIVE custom skins to image
+ These were ported from ess-dive-catalog.  This
+ saves the extra step of deployments
+ Metacat waits for solr to startup

Supports Issue ess-dive/ess-dive-project#99
@vchendrix vchendrix force-pushed the issue-project-99-solr-service branch from d75ac25 to 3336e05 Compare June 22, 2021 22:56
vchendrix added 4 commits July 7, 2021 07:39
This will address security vulnerabilities in 8.4

Closes #25
This paramterizes SOLR_VERSION and make sure it is reflected
in the docker image name
@vchendrix vchendrix merged commit 5b1bf20 into master Jul 23, 2021
@vchendrix vchendrix deleted the issue-project-99-solr-service branch July 23, 2021 17:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants