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
Oliver Walters
3381c5e257
Improvements to development docker-compose script
...
- Python packages are installed in a virtual environment within the src dir
- This prevents a LONG installation process each time the docker image is rebuilt
2021-05-12 20:53:50 +10:00
Oliver Walters
914db9e913
Development docker image
...
- Uses multistage build
- Adds a docker compose file for dev
2021-05-12 19:28:04 +10:00
Matthias
d8769748f5
config
2021-05-06 14:46:32 +02:00
Oliver Walters
b08cd8da20
Remove dbbackup integration
...
- Data dumping and restoring is now very complex!
- We should use the invoke export-records function now, rather than relying on dbbackup / dbrestore
- Documentation will be updated to match
2021-04-25 12:14:36 +10: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
Matthias
5a7f83798e
docker-start - collect static js #1485
2021-04-20 18:46:35 +02:00
Matthias
fdf3e3a333
added expiry headers to nginx-docker #1485
2021-04-20 18:45:59 +02:00
Oliver Walters
4531030551
Fix line endings
2021-04-18 19:37:11 +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
9eb559bec5
More install fixes
2021-04-18 15:09:01 +10:00
Oliver Walters
69473b9bff
Fix install
...
Also make the web port configurable
2021-04-18 15:05:52 +10:00
Oliver Walters
c07aef7f75
Remove commented line
2021-04-18 14:58:02 +10:00
Oliver Walters
cbb94d2ff7
sqlite3 -> sqlite
2021-04-18 14:57:25 +10:00
Oliver Walters
75054f870e
Fix
2021-04-18 14:50:22 +10:00
Oliver Walters
124db01b63
Add binaries for database dumping
2021-04-18 14:45:41 +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
91b6f98f95
Update directory structure to match docker config
2021-04-10 22:08:36 +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
5e54b0f5cf
Auto-generate key file if it does not exist!
2021-04-10 19:01:02 +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
8eb571bddf
Update dockerfile
2021-04-10 15:08:10 +10:00
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
4a3ca4638c
Dockerfile updates
2021-04-07 22:27:55 +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
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
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