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

Circle and docker #482

Merged
merged 7 commits into from
Jul 13, 2018
Merged

Circle and docker #482

merged 7 commits into from
Jul 13, 2018

Conversation

mcritchlow
Copy link
Member

Fixes #481

Local Checklist

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

What does this PR do?

This PR does 2 things.

  1. It updates the CircleCI config file to use the custom damsrepo and postgres Docker images that I've created instead of pontos.

  2. It creates a Docker-based dev/test environment that can be used locally instead of dams-vagrant

  • It adds a Dockerfile for damspas
  • It adds a set of environment files in /docker
  • It adds a docker-compose.yml file for creating an environment that builds and runs containers for damspas, damsrepo, postgres, and solr
Why are we doing this? Any context of related work?

References #481

Where should a reviewer start?

  • The circleci config file can be reviewed fairly independently of the rest
  • I would look at the changes in the config/ files, as those reflect one of the major changes which is changing the default database for all environments to postgres.
  • Please look at docker/README.md for some notes on how to setup the dev environment. If anyone is up for giving it a try locally that would be great.

Database changes

  • Changes default database for all environments to postgres

Deployment Instructions

  • See docker/README.md for local dev setup

@ucsdlib/developers - please review

We now use local postgres and tomcat (damsrepo/solr) containers instead
of depending on pontos
Using Docker and Docker Compose, we can now run a localized development
environment that will mirror the CircleCI testing environment.

Please see docker/README.md for setup instructions
@coveralls
Copy link

coveralls commented Jul 13, 2018

Coverage Status

Coverage decreased (-0.07%) to 65.899% when pulling a592840 on circle-and-docker into d1c5b19 on develop.

@mcritchlow
Copy link
Member Author

@ucsdlib/developers - Just an update, thanks to @lsitu for testing, I think this PR may be good to go now. If anyone else has any concerns please let me know, otherwise I think it would be nice to start leveraging this from the mainline branch soon if we can. Thanks!

@hweng
Copy link
Contributor

hweng commented Jul 13, 2018

👍

1 similar comment
@VivianChu
Copy link
Member

👍

@lsitu
Copy link
Member

lsitu commented Jul 13, 2018

@mcritchlow Nice to have docker for damspas! 👍

@lsitu lsitu merged commit a0fa3e7 into develop Jul 13, 2018
@lsitu lsitu deleted the circle-and-docker branch July 13, 2018 22:22
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