Page MenuHomeSoftware Heritage

maven: diff docker dev setup

Authored by borisbaldassari on Dec 8 2021, 11:58 AM.



Modifications needed to run the maven lister and loader with Docker compose.

Related to T1724

Diff Detail

rDENV Development environment
Automatic diff as part of commit; lint not applicable.
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

ardumont added a subscriber: ardumont.


I thought there was more to it than just this ;)

This revision is now accepted and ready to land.Dec 8 2021, 12:29 PM
  • swh-search: upgrade elasticsearch to 7.15.2
  • docker/conf/loader: Add missing LoadNixguix task
  • stop to use the deprecated docker-compose --no-ansi command line option
  • Add durations to nginx and swh-storage access log
  • Ensure swh-web is started before trying to refresh the save code now statuses
  • Increase the swh-web timeout for swh-storage requests
  • add libcmph-dev so that swh-perfecthash can build and install
  • doc: transform markdown links into rst links
  • codespell: cmak is not a spelling mistake
  • Overhaul debian packaging bootstrap scripts
  • Merge master into T1724_docker_dev

Please use rebase instead of merge. And there are currently a bunch of commits by other people in your diff; try an interactive rebase (git rebase -i master) to get rid of them

rebase and fix conflicts from master

This revision was automatically updated to reflect the committed changes.

Hi @vlorentz

Yes, I had a conflict with the master's updates which messed up everything -- well, I messed up, to be precise.
It should be ok now, and the diff has been landed on master.