Skip to content
This repository has been archived by the owner on Mar 24, 2020. It is now read-only.

Support multiple docker-compose environments #496

Merged
merged 2 commits into from
Jul 23, 2018

Conversation

mcritchlow
Copy link
Member

Fixes #495

Local Checklist

  • QA-ed locally?
  • Rebased with master branch?
  • Configuration updated (if needed)?
  • Documentation updated (if needed)?

What does this PR do?

The work entails the following:

  • Switching to use Solr from an official Docker container that matches our version in use (5.5)
  • Replacing the old, incorrect solr configuration with what we use in
    production
  • Creating two docker-compose options for running damspas under docker,
    see docker/README.md
  • Update circleci to use docker/ci/docker-compose.yml
Why are we doing this? Any context of related work?

References #495

Where should a reviewer start?

Please look at the docker/README.md file. In particular, if you all can run the dev/docker-compose.yml file and let me know if everything works and passes for you that would be great. If any of the documentation seems lacking, please let me know.

Also it may be worth doing a docker system prune as noted in that README if you've been testing the other Docker work so far. It should help ensure you have a clean build environment.


@ucsdlib/developers - please review

The work entails the following:
- Switching to use solr from a Docker container
- Replacing the old, incorrect solr configuration with what we use in
production
- Creating two docker-compose options for running damspas under docker,
see docker/README.md
- Update circleci to use docker/ci/docker-compose.yml
@lsitu
Copy link
Member

lsitu commented Jul 20, 2018

👍

CircleCI image that must be used for the machine executor has an out of date ruby, but it is a 2.3 image, so the specs pass. Agreed to temporarily mark pending
@coveralls
Copy link

Coverage Status

Coverage increased (+0.6%) to 66.53% when pulling 6d01a5b on docker-composes-with-solr into d72c0f2 on develop.

@mcritchlow
Copy link
Member Author

mcritchlow commented Jul 20, 2018

@ucsdlib/developers - Just a note that in order to set this up cleanly I had to update the damsrepo image to remove Solr, which is now in the main image that CircleCI will pull. Which may mean other PR/builds might fail until we get this merged. It depends on how circleci does its caching, I'm not sure.. Not to rush anyone's review and the eventual merge of this, but wanted to make you all aware.

@VivianChu
Copy link
Member

👍

@hweng
Copy link
Contributor

hweng commented Jul 23, 2018

👍

@hweng hweng merged commit 21ae16a into develop Jul 23, 2018
@hweng hweng deleted the docker-composes-with-solr branch July 23, 2018 18:00
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants