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

Add environment variables for Redis and Postgres hosts #1641

Merged
merged 10 commits into from
Jun 5, 2020
Merged

Add environment variables for Redis and Postgres hosts #1641

merged 10 commits into from
Jun 5, 2020

Conversation

rushtehrani
Copy link
Contributor

Motivation and context

Fixes #445

These are the changes made to make it so that CVAT can run on Kubernetes:

  • Added environment variables for:
    • Redis HOST
    • Postgres HOST
  • Changed POSTGRES_PASSWORD => CVAT_POSTGRES_PASSWORD to avoid collision with other environments. Note this change could backwards compatibility for certain users.

We are submitting this PR for review and additional discussion. We will update documentation and tests (if applicable) once we have indication that these changes can be merged.

How has this been tested?

We are running CVAT on Onepanel which is based on Kubernetes and with these changes, we have been able to make CVAT work in a Kubernetes environment.

Checklist

License

  • I submit my code changes under the same MIT License that covers the project.
    Feel free to contact the maintainers if that's a concern.
  • I have updated the license header for each file (see an example below)
# Copyright (C) 2020 Intel Corporation
#
# SPDX-License-Identifier: MIT

rushtehrani and others added 7 commits May 12, 2020 10:00
- Added environment variables for:
  - Redis Host
  - Postgres Host
- Change `POSTGRES_PASSWORD` => `CVAT_POSTGRES_PASSWORD` to avoid collision with other scripts.
Update to support additional env vars
@coveralls
Copy link

coveralls commented Jun 3, 2020

Pull Request Test Coverage Report for Build 5456

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • 1 unchanged line in 1 file lost coverage.
  • Overall coverage increased (+0.02%) to 65.734%

Files with Coverage Reduction New Missed Lines %
cvat/apps/engine/media_extractors.py 1 77.35%
Totals Coverage Status
Change from base Build 5455: 0.02%
Covered Lines: 10876
Relevant Lines: 16145

💛 - Coveralls

@rushtehrani rushtehrani changed the title Develop Add environment variables for Redis and Postgres hosts Jun 3, 2020
@nmanovic
Copy link
Contributor

nmanovic commented Jun 3, 2020

@rushtehrani , thank you very much for the PR. Could you please add the a line into CHANGELOG.md file? It is the only comment I have for the PR.

@rushtehrani
Copy link
Contributor Author

@nmanovic done

nmanovic
nmanovic previously approved these changes Jun 4, 2020
Copy link
Contributor

@nmanovic nmanovic left a comment

Choose a reason for hiding this comment

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

LGTM

@nmanovic
Copy link
Contributor

nmanovic commented Jun 4, 2020

@azhavoro , could you please test the patch and merge? It looks very well for me.

@nmanovic nmanovic merged commit 3cb1f52 into cvat-ai:develop Jun 5, 2020
412b added a commit to 412b/cvat that referenced this pull request Jun 23, 2020
Added env variables for Postgres DB and user names
nmanovic pushed a commit that referenced this pull request Jun 23, 2020
Added env variables for Postgres DB and user names
frndmg pushed a commit to signatrix/cvat that referenced this pull request Aug 5, 2020
* Update to support additional env vars

- Added environment variables for:
  - Redis Host
  - Postgres Host
- Change `POSTGRES_PASSWORD` => `CVAT_POSTGRES_PASSWORD` to avoid collision with other scripts.

* Using ENV vars in supervisord.conf

* Fixing ENV vars.

* add env vars to docker-compose.yml

* merge supervisord.conf

* update docker-compose env var values

* Update CHANGELOG.md

Co-authored-by: Aleksandr Melnikov <[email protected]>
Co-authored-by: Nikita Manovich <[email protected]>
frndmg pushed a commit to signatrix/cvat that referenced this pull request Aug 5, 2020
Added env variables for Postgres DB and user names
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.

Add more environment variables to configure CVAT container
3 participants