inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2026-07-18 12:36:11 +00:00
Code Activity
4,838 Commits 9 Branches 164 Tags
ed304f571a78a839018154b120a7081ab3b92fa9
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver Walters ed304f571a Better configuration of github repo 2021-04-08 00:05:37 +10:00
Oliver Walters 14aead038e Adds docker_compose file 2021-04-07 23:46:30 +10:00
Oliver Walters d4d9263131 Add option to specify config file via environment variable 2021-04-07 23:46:03 +10:00
Oliver Walters 9c38d67b52 Merge remote-tracking branch 'upstream/master' into django-q 
# Conflicts:
#	InvenTree/InvenTree/status.py
#	InvenTree/templates/about.html
 2021-04-07 22:29:47 +10:00
Oliver Walters 4a3ca4638c Dockerfile updates 2021-04-07 22:27:55 +10:00
Oliver Walters d91531720b Unit testing for task scheduling 2021-04-07 22:17:24 +10:00
OliverandGitHub 5e0e364b6c Merge pull request #1441 from SchrodingersGat/missing-git 
Hide git information if there is an error
 2021-04-07 22:09:38 +10:00
OliverandGitHub da63ec5351 Merge pull request #1437 from matmair/translation_improv 
Translation improvements
 2021-04-07 20:57:47 +10:00
Oliver Walters 6412cf1c87 Hide git information if there is an error 2021-04-07 20:55:44 +10:00
Oliver Walters 00c4519d28 Simplify dockerfile 2021-04-02 00:54:29 +11:00
Oliver Walters 2436b1f2c9 Entrypoint script - start.sh 2021-04-02 00:40:47 +11:00
Oliver Walters 8d3b9e2ca4 Updates to settings.py 
- Create secret_key.txt if it does not exist
- Copy default settings file if it does not exist
 2021-04-02 00:06:17 +11:00
Oliver Walters be41be3981 Add "wait_for_db" management command 2021-04-02 00:03:56 +11:00
Oliver Walters 8e7e36089b Fix venv 2021-04-01 21:11:59 +11:00
Oliver Walters 47ba0599eb Reference environment variables in supervisor conf file 2021-04-01 20:44:27 +11:00
Oliver Walters db858b3cfc Install packages inside venv 2021-04-01 20:44:13 +11:00
Oliver Walters 148600a9c4 Copy gunicorn.conf.py 2021-04-01 20:38:18 +11:00
Oliver Walters 839c29117d Dockerfile updates 
- Pipe supervisor logs to stdout (so they are passed to the docker instance)
- Fix supervisor service
- Expose home dir and port as env vars
 2021-04-01 20:30:51 +11:00
Oliver Walters d446f8ddd1 Add supervisor conf file specific to docker 2021-04-01 20:14:31 +11:00
Oliver Walters 08a1a6cf43 Add configuration options for the Dockerfile 2021-04-01 20:14:17 +11:00
Oliver Walters 76ab38a06b Add docker info 2021-04-01 11:35:03 +11:00
Oliver Walters 38b9655ad9 Remove unused workflow 2021-04-01 08:43:58 +11:00
Oliver Walters b9e81c3c0e Start supervisord 
Ref: https://advancedweb.hu/supervisor-with-docker-lessons-learned/
 2021-03-31 23:39:16 +11:00
Oliver Walters b9f9b26ca5 Sudo not required, I guess? 2021-03-31 23:32:03 +11:00
Oliver Walters 7683cc1aaa APK not APT 2021-03-31 23:27:01 +11:00
Oliver Walters ff6b127f1b Typo fixin' 2021-03-31 23:22:17 +11:00
Oliver Walters 8b227ce297 More required packages, I guess... 2021-03-31 23:20:32 +11:00
Oliver Walters 286cf9b102 gcc required 2021-03-31 23:12:27 +11:00
Oliver Walters 24d36e0b66 Getting there... 2021-03-31 23:09:24 +11:00
Oliver Walters 251ec7a02f Fix lib names 2021-03-31 23:06:54 +11:00
Oliver Walters 61f8b982ce lib name fix 2021-03-31 23:03:13 +11:00
Oliver Walters 1f881dd041 Run as root 2021-03-31 23:00:22 +11:00
Oliver Walters 42b400e619 typo fix 2021-03-31 22:58:32 +11:00
Oliver Walters 601aff8283 Install git 2021-03-31 22:55:44 +11:00
Oliver Walters 58bfc80f79 Alpine uses different commands 2021-03-31 22:54:17 +11:00
Oliver Walters 2746396d11 Fix tag name 2021-03-31 22:50:41 +11:00
Oliver Walters 6017cad6b3 So apparently I cannot spell... 2021-03-31 22:48:58 +11:00
Oliver Walters 1a7b6e2613 Fix 2021-03-31 22:47:41 +11:00
Oliver Walters ab57fd3b76 Build docker image 2021-03-31 22:45:42 +11:00
Oliver Walters c0a0ca4588 PEP fix 2021-03-31 22:35:48 +11:00
Oliver Walters 3f257279ee Specify directories for CI 2021-03-31 22:31:50 +11:00
Oliver Walters 731ec25b24 Merge remote-tracking branch 'inventree/master' into django-q 
# Conflicts:
#	.github/workflows/style.yaml
#	.travis.yml
#	InvenTree/InvenTree/settings.py
 2021-03-31 22:17:38 +11:00
OliverandGitHub 53c9475e6d Update README.md 2021-03-31 22:11:01 +11:00
OliverandGitHub 9ccff64679 Update README.md 2021-03-31 22:10:12 +11:00
OliverandGitHub de3395ed26 Update README.md 2021-03-31 22:09:39 +11:00
OliverandGitHub 16433f49c6 Merge pull request #1433 from SchrodingersGat/coverage-workflow 
Add workflow for code coverage
 2021-03-31 22:08:08 +11:00
Oliver Walters 73e032e1d0 Specify database name 2021-03-31 21:54:13 +11:00
Oliver Walters 82b6c48946 Specify database name 2021-03-31 21:48:54 +11:00
Oliver Walters 566c3af39e Environment variables take preference! 2021-03-31 21:40:19 +11:00
Oliver Walters 5d141e3568 Always print database config 2021-03-31 21:24:14 +11:00
Oliver Walters 83cd24961d INFO level debug 2021-03-31 21:18:17 +11:00
Oliver Walters 737a378515 Extra debug output for tests 2021-03-31 21:17:17 +11:00
Oliver Walters f71ebc20ec Remove travis script 2021-03-31 21:07:16 +11:00
Oliver Walters ac9753e72c Add data import/export step 2021-03-31 20:58:30 +11:00
Oliver Walters dc94376f6d Fix workflows 2021-03-31 20:46:26 +11:00
Oliver Walters c846e2e65a Use env variables rather than custom ci scripts 2021-03-31 20:39:22 +11:00
Oliver Walters 608f47837f Update README.md with badges 2021-03-31 20:26:47 +11:00
Oliver Walters 2f6ee330de Add CI check against MariaDB 2021-03-31 20:20:10 +11:00
Oliver Walters c66dddc03f Force TCP for postgres 2021-03-31 20:14:57 +11:00
Oliver Walters 48cbd3be97 Remove (old) docs 2021-03-31 20:13:12 +11:00
Oliver Walters 6b99808c52 Run as root 2021-03-31 20:12:45 +11:00
Oliver Walters 61d14a0eda Database naming fix 2021-03-31 20:07:42 +11:00
Oliver Walters 5aea35f8fa Force TCP 2021-03-31 20:04:18 +11:00
Oliver Walters 3cc0530419 Root password 2021-03-31 20:01:02 +11:00
Oliver Walters cef75aabc5 Update 2021-03-31 19:59:23 +11:00
Oliver Walters 09693d0d09 Start service 2021-03-31 19:54:37 +11:00
Oliver Walters 70703f8588 Try localhost 2021-03-31 19:48:20 +11:00
Oliver Walters 67a4c5a9a2 Try pointing to different host 2021-03-31 19:45:58 +11:00
Oliver Walters db8d93e2e9 Create mysql database manually 2021-03-31 17:54:42 +11:00
Oliver Walters af52f0eace Typo fix 2021-03-31 17:45:57 +11:00
Oliver Walters 631e41e22a Fix postgres workflow 2021-03-31 17:40:37 +11:00
Oliver Walters f8d29b7b3b Typo 2021-03-31 17:36:33 +11:00
Oliver Walters 9e4218d02f Mysql fixes 2021-03-31 17:34:12 +11:00
Oliver Walters d09483f30c Workflow fixes 2021-03-31 17:28:30 +11:00
Oliver Walters d1a42f55a2 Fix flake issues 2021-03-31 17:20:12 +11:00
Oliver Walters bdd5fa96e7 Add tests for mysql and postgresql 2021-03-31 17:18:04 +11:00
Oliver Walters 4f87c848a5 Ensure flake8 fails 2021-03-31 17:17:40 +11:00
Oliver Walters d20c3bb733 GITHUB_TOKEN 2021-03-31 17:08:24 +11:00
Oliver Walters ae72224ece Fix coveralls 2021-03-31 16:57:44 +11:00
Oliver Walters fd43f8dc64 Merge remote-tracking branch 'inventree/master' into coverage-workflow 
# Conflicts:
#	.github/workflows/style.yaml
 2021-03-31 16:26:02 +11:00
Oliver Walters 6b32142725 run on pull request 2021-03-31 16:24:33 +11:00
Oliver Walters 01e6635032 Add workflow for code coverage 2021-03-31 13:06:22 +11:00
OliverandGitHub 88a021f165 Merge pull request #1432 from SchrodingersGat/style-checks 
Update style worfdlow
 2021-03-31 13:05:59 +11:00
Oliver Walters b16f85de65 Update style worfdlow 2021-03-31 12:41:39 +11:00
OliverandGitHub 865436c42a Merge pull request #1431 from SchrodingersGat/workflows 
Add code style workflow
 2021-03-30 22:41:27 +11:00
Oliver Walters db994fd908 Add code style workflow 2021-03-30 21:56:17 +11:00
Oliver Walters 83f8afe113 Add github actions 2021-03-30 21:33:49 +11:00
Oliver Walters e7ed4c4eab Travis fixes 2021-03-30 21:24:06 +11:00
Oliver Walters 39b2c5f943 Reintroduce default database config 2021-03-30 21:18:09 +11:00
Oliver Walters 3ddbb6a6cd Check for empty values 2021-03-30 20:53:26 +11:00
OliverandGitHub fd01e23245 Merge pull request #1430 from SchrodingersGat/missing-permission-fix 
Emit warning rather than raise error
 2021-03-30 10:28:54 +11:00
Oliver Walters 1a288168b7 PEP fixes 2021-03-30 10:00:43 +11:00
OliverandGitHub f288b906ad Merge pull request #1426 from SchrodingersGat/assign-by-sn 
Assign by sn
 2021-03-30 09:29:49 +11:00
Oliver Walters 58c30f48d5 Remove extra whitespace 2021-03-30 09:28:02 +11:00
Oliver Walters bfbdd72306 Remove unused import 2021-03-30 08:43:09 +11:00
Oliver Walters 0b78f3d931 Add unit testing for migrations 2021-03-30 08:42:44 +11:00
Oliver Walters 32cfe1b954 Emit warning rather than raise error 
- All calling functions check for None anyway
 2021-03-30 08:25:51 +11:00
OliverandGitHub 67f06d6e5d Merge pull request #1428 from inventree/dependabot/pip/pygments-2.7.4 
Bump pygments from 2.2.0 to 2.7.4
 2021-03-30 08:16:21 +11:00
Oliver Walters 408b9d5e5b Fix for unit testing 2021-03-30 08:08:55 +11:00
Oliver Walters 709bfb1bd2 Remove "unique" constraint for part / order relationship 2021-03-30 00:14:47 +11:00