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 
						 
				 
			
				
					
						
							
							
								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