Matthias
59e6cc1a10
Merge branch 'master' of https://github.com/inventree/InvenTree into part-import
2021-06-18 23:10:59 +02:00
Oliver Walters
0c572486ba
Revert volume path
2021-04-22 12:49:11 +10:00
Oliver Walters
52deb20e85
docker-compose improvements
...
- Prepend "inventree" to the name of each container
- Explicitly expose more env variables required for InvenTree db lookup
- Adjust server name in nginx-conf file
2021-04-22 12:15:25 +10:00
Oliver Walters
aced0e73c7
compose file cleanup
2021-04-18 18:58:00 +10:00
Oliver Walters
61eba2f7fc
Typo fix
2021-04-18 18:54:21 +10:00
Oliver Walters
0926992b4f
Updated nginx conf
2021-04-18 18:53:30 +10:00
Oliver Walters
d8e1e18f4d
change web -> inventree
2021-04-18 17:21:06 +10:00
Oliver Walters
eb108edb60
Adds entrypoint for starting a development server
2021-04-18 16:26:32 +10:00
Oliver Walters
270c0ea85d
Cleanup docker files
2021-04-18 15:24:33 +10:00
Oliver Walters
c2f85b0447
docker-compose tweaks
2021-04-11 15:25:32 +10:00
Oliver Walters
f9449da576
Merge remote-tracking branch 'upstream/master' into django-q
...
# Conflicts:
# InvenTree/InvenTree/version.py
2021-04-11 15:03:33 +10:00
Oliver Walters
5f9236d280
Updates to docker files
2021-04-11 14:46:40 +10:00
Oliver Walters
f6f3815f31
Include worker status in main API call
2021-04-11 13:58:59 +10:00
Oliver Walters
5a168abbfe
Separated docker file into separate directory
2021-04-10 22:42:08 +10:00
Oliver Walters
8f626d305e
Fix location of entrypoint scripts
2021-04-10 22:35:10 +10:00
Oliver Walters
5d9e273559
Adds nxinx service
2021-04-10 22:25:07 +10:00
Oliver Walters
2f1db486a0
Do not use python virtual environment inside container
2021-04-10 21:40:27 +10:00
Oliver Walters
823f84e46a
Simplified volume management in docker-compose
2021-04-10 20:58:51 +10:00
Oliver Walters
9086c8a3bf
Simplify external directory structure
...
- All InvenTree data now in a single subdir
- Copy default config file (if it does not exist)
- Config file is accessible from outside world
- Update start_server and start_worker scripts
2021-04-10 17:36:19 +10:00
Oliver Walters
1372343bd5
Updates to docker-compose file
...
- Note: not ready yet!
2021-04-10 15:27:50 +10:00
Oliver Walters
14aead038e
Adds docker_compose file
2021-04-07 23:46:30 +10:00