Merge branch 'dev-setup' into 'develop'
Fixed bad order in contributing instructions See merge request funkwhale/funkwhale!253
This commit is contained in:
		
						commit
						c6b04ee5f1
					
				
							
								
								
									
										22
									
								
								CONTRIBUTING
								
								
								
								
							
							
						
						
									
										22
									
								
								CONTRIBUTING
								
								
								
								
							|  | @ -61,16 +61,6 @@ If you do not want to add the ``-f dev.yml`` snippet everytime, you can run this | |||
|     export COMPOSE_FILE=dev.yml | ||||
| 
 | ||||
| 
 | ||||
| Building the containers | ||||
| ^^^^^^^^^^^^^^^^^^^^^^^ | ||||
| 
 | ||||
| On your initial clone, or if there have been some changes in the | ||||
| app dependencies, you will have to rebuild your containers. This is done | ||||
| via the following command:: | ||||
| 
 | ||||
|     docker-compose -f dev.yml build | ||||
| 
 | ||||
| 
 | ||||
| Creating your env file | ||||
| ^^^^^^^^^^^^^^^^^^^^^^ | ||||
| 
 | ||||
|  | @ -84,6 +74,16 @@ Create it like this:: | |||
|     touch .env | ||||
| 
 | ||||
| 
 | ||||
| Building the containers | ||||
| ^^^^^^^^^^^^^^^^^^^^^^^ | ||||
| 
 | ||||
| On your initial clone, or if there have been some changes in the | ||||
| app dependencies, you will have to rebuild your containers. This is done | ||||
| via the following command:: | ||||
| 
 | ||||
|     docker-compose -f dev.yml build | ||||
| 
 | ||||
| 
 | ||||
| Database management | ||||
| ^^^^^^^^^^^^^^^^^^^ | ||||
| 
 | ||||
|  | @ -124,7 +124,7 @@ Launch all services | |||
| 
 | ||||
| Then you can run everything with:: | ||||
| 
 | ||||
|     docker-compose -f dev.yml up | ||||
|     docker-compose -f dev.yml up front api nginx celeryworker | ||||
| 
 | ||||
| This will launch all services, and output the logs in your current terminal window. | ||||
| If you prefer to launch them in the background instead, use the ``-d`` flag, and access the logs when you need it via ``docker-compose -f dev.yml logs --tail=50 --follow``. | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue
	
	 Eliot Berriot
						Eliot Berriot