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 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						5a7f83798e 
					 
					
						
						
							
							docker-start - collect static js  #1485  
						
						
						
						
					 
					
						2021-04-20 18:46:35 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						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