Skip to content

Enable deployment#677

Merged
pombredanne merged 37 commits into
mainfrom
deployment
Apr 9, 2022
Merged

Enable deployment#677
pombredanne merged 37 commits into
mainfrom
deployment

Conversation

@pombredanne

Copy link
Copy Markdown
Member

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 pombredanne@nexb.com

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

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Also bump version. Use Djnago settings by default.

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
This can cause endless, infinite loop of failure/restart

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Ensure that we always install "dot" locally
Streamline other target
Remove unused targets


Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Also bump django-environ that was super old otherwise

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
* Format long lines in doctests.
* Remove dead imports.
* Convert comments to docstring

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
* 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 <pombredanne@nexb.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
This is too complex and requires more design to enable.

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>

@Hritik14 Hritik14 left a comment

Copy link
Copy Markdown
Collaborator

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.

Comment thread CHANGELOG.rst Outdated
Comment thread Dockerfile
# See https://aboutcode.org for more information about nexB OSS projects

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

Copy link
Copy Markdown
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
Copy Markdown
Member 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
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Ouch !

Comment thread Makefile
Comment thread docs/source/installation.rst
Comment thread vulnerablecode/settings.py
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Reported-by: Hritik Vijay <hritikxx8@gmail.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
There is a precedence of /etc/vulnerablecode/.env over the local .env
file in all cases

Reported-by: Hritik Vijay <hritikxx8@gmail.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@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