Commit Graph

115 Commits

Author SHA1 Message Date
Oliver
ab3acc4601 Target production docker-compose script to inventree:stable 2021-11-05 07:52:15 +11:00
Oliver Walters
1832a6f1fa Run APK upgrade
Ref:
2021-10-13 00:53:41 +11:00
Oliver Walters
c3e0c9378f Upgrade pip as part of dockerfile 2021-10-13 00:52:48 +11:00
Oliver Walters
ac242c01c1 Updates for building cryptography lib 2021-10-13 00:46:46 +11:00
Matthias
c872412d04
rust for SSO needed 2021-10-07 00:26:37 +02:00
Oliver
47524f6ea3 Fix for docker development env file 2021-08-23 08:39:09 +10:00
Antonin Kral
7f126e58d2
Fix for production docker environment
Values are passed as written resulting in `"WARNING"` being passed to python logger, which will complain and panic. Fix is simply to remove `"` from the value.
2021-08-22 20:59:51 +02:00
Oliver
9ed2025021 Add a TODO for future reference 2021-08-19 11:14:13 +10:00
Oliver
52bdfe5465 Env interpolation doesn't seem to work in the CMD 2021-08-18 20:52:14 +10:00
Oliver
eeac561b9b typo fix 2021-08-18 17:07:23 +10:00
Oliver
2095d66677 Fix entrypoint / cmd for production server 2021-08-18 16:29:54 +10:00
Oliver
79d7a9f922 fix typo in dockerfile 2021-08-18 15:16:22 +10:00
Oliver
db477bceab typo fix 2021-08-18 14:47:34 +10:00
Oliver
d756579a06 Split production environment variables out into a .env file 2021-08-18 13:02:36 +10:00
Oliver
c1ea6dbb9b Remove commented out functionality from the entrypoint command 2021-08-18 12:28:09 +10:00
Oliver
c2af401854 Pin base python package requirements
- Require invoke to be installed before we can run "invoke update"
2021-08-18 12:03:24 +10:00
Oliver
8fea9bc645 Re-add docker file git version info 2021-08-18 11:25:19 +10:00
Oliver
7bfddd6d51 Simplify init scripts
Single script init.sh which performs the following tasks:
- Creates required directory structure
- Activates python venv (if required)
- Waits for database connection
- Runs command
2021-08-18 09:52:27 +10:00
Oliver
3b8ee48581 Fix env defines in dockerfile 2021-08-18 09:34:09 +10:00
Oliver
b48db6f8fe Dockerfile fixes 2021-08-17 23:15:05 +10:00
Oliver
187c9b0971 Add server init script
- Taken (mostly) from https://github.com/inventree/InvenTree/pull/1949
2021-08-17 23:10:57 +10:00
Oliver
8b66babd49 Refactor dockerfile
- Ref: https://github.com/inventree/InvenTree/pull/1949
- Squash all apk commands into single line
- Drop to inventree user rather than running as root
- Separate entrypoint and cmd for each target
- Set the INVENTREE_PY_ENV variable in development mode
2021-08-17 22:58:44 +10:00
Oliver
895f9f3ce0 Pull debug level out into the .env file 2021-08-17 20:45:57 +10:00
Oliver
a474000361 Fix critical error in dockerfile
- Don't' be putting no spaces in!
2021-08-17 20:29:48 +10:00
Oliver
7bf3229595 Add comment to docker-compose file 2021-08-17 20:00:54 +10:00
Oliver
07857c3088 Simplify dev-config.env file
- Don't need to re-specify the internal docker variables
- Add comments
2021-08-17 19:59:32 +10:00
Oliver
206743b58d Add a default value for INVENTREE_WEB_ADDR 2021-08-17 19:58:55 +10:00
Oliver
7df4451c08 Move some core pypi deps into requirements file 2021-08-12 22:06:47 +10:00
Oliver
31bb7734ce Update dockerfile to allow downloading against a specific git tag 2021-08-12 22:01:14 +10:00
Mark De Deuge
fc06bc7574
Update nginx.conf to use http_host rather than host fixes #1930
Using proxy_set_header Host $host; does not pass through the port. This causes the /api-doc/ route to miss the port when attempting to render routes. 
This fixes: #1930
2021-08-10 10:27:40 +10:00
Oliver Walters
d9f4c34a42 logging.get -> logging.getLogger 2021-07-29 23:44:52 +10:00
Oliver
dd12a593f4 Specify how many workers to use 2021-07-29 16:37:34 +10:00
Oliver
bc3c3be751 force linux-style line endings for .sh files 2021-07-29 09:10:46 +10:00
Oliver
399e44fce7 Copy static files when starting dev server 2021-07-28 22:30:41 +10:00
Oliver
fa1644ed2c python -> python3 2021-07-02 13:07:42 +10:00
Oliver
9cdc5a1fa1 Explicitly install python3-pip 2021-07-02 12:59:54 +10:00
Oliver
56c3697e34 docker: Use a specific version of alpine 2021-07-02 12:57:37 +10:00
Oliver Walters
8e9bf2aadd Fix typo in docker-compose.yml 2021-06-16 23:31:36 +10:00
Oliver Walters
d85b906560 Fix comment in docker-compose.yml file 2021-06-16 22:57:31 +10:00
Oliver Walters
7dd63b36da Simplify dockerfile / docker-compose
- Single data volume now also includes 'static' files
- InvenTree source repo is now cloned into /home/inventree (to match the "dev" image)
2021-06-16 22:36:05 +10:00
Oliver Walters
acd7322ff0 Files under /media require session to be authenticated
References:

- https://docs.djangoproject.com/en/3.2/howto/deployment/wsgi/apache-auth/
- https://stackoverflow.com/questions/46421589/nginx-location-and-django-auth
- https://docs.nginx.com/nginx/admin-guide/security-controls/configuring-subrequest-authentication/
- https://pawamoy.github.io/posts/django-auth-server-for-shiny/
2021-06-16 21:30:25 +10:00
Oliver Walters
058fc57ff1 Serve media files via nginx 2021-06-16 20:57:24 +10:00
Oliver Walters
632ea593fe Fix default port association 2021-06-15 23:40:50 +10:00
Oliver Walters
8bfdb0bec6 Comment fix 2021-06-15 23:19:50 +10:00
Oliver Walters
01328075ea All "development" related stuff now goes under ./dev
- Update dev-config.env
- Update docker-compose.dev.yml
- Development target of Dockerfile no longer creates any folders
- Update entry point scripts
2021-06-15 23:05:03 +10:00
Oliver Walters
ff80c722fb Docker: Add parent directories if they do not exist 2021-05-25 09:32:21 +10:00
Matthias
b2a912c770 docker-mode switch in settings and tags 2021-05-16 18:19:35 +02:00
Oliver Walters
719b1775f2 Add entrypoint for running development worker 2021-05-12 22:12:26 +10:00
Oliver Walters
530f28ba95 Fix for running webserver 2021-05-12 21:35:54 +10:00
Oliver Walters
00c5a88383 Split environment variables out into a .env file
- No need to collect "static" file when we are running in DEBUG mode
2021-05-12 21:15:53 +10:00