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

Enable deployment #677

Merged
merged 37 commits into from
Apr 9, 2022
Merged

Enable deployment #677

merged 37 commits into from
Apr 9, 2022

Conversation

pombredanne
Copy link
Collaborator

This PR makes multiple adjustments to enable deployment:

  • update settings, Makefile and configuration
  • clean, streamline and align Docker configuration
  • improve README and documentation

A lot of this was done to align and borrow ScanCode.io config

Reference: #468
Signed-off-by: Philippe Ombredanne [email protected]

Also align with SCIO and do not use variables got gunicorn server

Signed-off-by: Philippe Ombredanne <[email protected]>
Signed-off-by: Philippe Ombredanne <[email protected]>
Signed-off-by: Philippe Ombredanne <[email protected]>
Also bump version. Use Djnago settings by default.

Signed-off-by: Philippe Ombredanne <[email protected]>
Signed-off-by: Philippe Ombredanne <[email protected]>
Signed-off-by: Philippe Ombredanne <[email protected]>
This can cause endless, infinite loop of failure/restart

Signed-off-by: Philippe Ombredanne <[email protected]>
Signed-off-by: Philippe Ombredanne <[email protected]>
Ensure that we always install "dot" locally
Streamline other target
Remove unused targets


Signed-off-by: Philippe Ombredanne <[email protected]>
Signed-off-by: Philippe Ombredanne <[email protected]>
Signed-off-by: Philippe Ombredanne <[email protected]>
Signed-off-by: Philippe Ombredanne <[email protected]>
Signed-off-by: Philippe Ombredanne <[email protected]>
Signed-off-by: Philippe Ombredanne <[email protected]>
Also bump django-environ that was super old otherwise

Signed-off-by: Philippe Ombredanne <[email protected]>
Signed-off-by: Philippe Ombredanne <[email protected]>
* Format long lines in doctests.
* Remove dead imports.
* Convert comments to docstring

Signed-off-by: Philippe Ombredanne <[email protected]>
Signed-off-by: Philippe Ombredanne <[email protected]>
Signed-off-by: Philippe Ombredanne <[email protected]>
* Use setup.cfg rather than setup.py
* Use new [dev] extra for development utilities
* Use requirements.txt as constraints for pinning deps. Drop using
  requirements-dev.txt
* Update pyproject.toml for tools including pytest, black and isort
* Update Makefile and Dockerfile accordingly
* Bump version to signal this is a beta
* Update dockerignore and other confif files
* Bump dependencies

Signed-off-by: Philippe Ombredanne <[email protected]>
Signed-off-by: Philippe Ombredanne <[email protected]>
Signed-off-by: Philippe Ombredanne <[email protected]>
Signed-off-by: Philippe Ombredanne <[email protected]>
Signed-off-by: Philippe Ombredanne <[email protected]>
This is too complex and requires more design to enable.

Signed-off-by: Philippe Ombredanne <[email protected]>
Copy link
Collaborator

@Hritik14 Hritik14 left a comment

Choose a reason for hiding this comment

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

This is really neat! Here are a few suggestions from my end.

CHANGELOG.rst Outdated Show resolved Hide resolved

# Force unbuffered stdout and stderr (i.e. they are flushed to terminal immediately)
FROM python:3.9
Copy link
Collaborator

Choose a reason for hiding this comment

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

Yay! We got 3.9.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@Hritik14 I am not sure this is what you think this is :D
See this proposed global approach https://github.com/nexB/aboutcode/pull/111/files#diff-7c33a51b412e7a778049cdc4990b84bec18b0e1ed48fa5b4c65fb2f5d7fe0ba6R43 based on this suggested new way: aboutcode-org/aboutcode#110

Copy link
Collaborator

Choose a reason for hiding this comment

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

Ouch !

Makefile Show resolved Hide resolved
docs/source/installation.rst Show resolved Hide resolved
vulnerablecode/settings.py Show resolved Hide resolved
Signed-off-by: Philippe Ombredanne <[email protected]>
Reported-by: Hritik Vijay <[email protected]>
Signed-off-by: Philippe Ombredanne <[email protected]>
Signed-off-by: Philippe Ombredanne <[email protected]>
Signed-off-by: Philippe Ombredanne <[email protected]>
There is a precedence of /etc/vulnerablecode/.env over the local .env
file in all cases

Reported-by: Hritik Vijay <[email protected]>
Signed-off-by: Philippe Ombredanne <[email protected]>
@pombredanne pombredanne merged commit c9904ae into main Apr 9, 2022
@pombredanne pombredanne deleted the deployment branch April 9, 2022 15:23
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.

2 participants