chore(compose): use canonical name for web service
This commit is contained in:
		
							parent
							
								
									65ec9c33fe
								
							
						
					
					
						commit
						2b5bf1d82d
					
				
							
								
								
									
										10
									
								
								.env.example
								
								
								
								
							
							
						
						
									
										10
									
								
								.env.example
								
								
								
								
							| 
						 | 
					@ -7,7 +7,7 @@ FUNKWHALE_DOMAIN=funkwhale.test
 | 
				
			||||||
FUNKWHALE_PROTOCOL=https
 | 
					FUNKWHALE_PROTOCOL=https
 | 
				
			||||||
 | 
					
 | 
				
			||||||
DJANGO_SECRET_KEY=dev
 | 
					DJANGO_SECRET_KEY=dev
 | 
				
			||||||
DJANGO_ALLOWED_HOSTS=.funkwhale.test,nginx
 | 
					DJANGO_ALLOWED_HOSTS=.funkwhale.test,web
 | 
				
			||||||
DJANGO_SETTINGS_MODULE=config.settings.local
 | 
					DJANGO_SETTINGS_MODULE=config.settings.local
 | 
				
			||||||
 | 
					
 | 
				
			||||||
DATABASE_URL=postgresql://postgres@postgres/postgres
 | 
					DATABASE_URL=postgresql://postgres@postgres/postgres
 | 
				
			||||||
| 
						 | 
					@ -24,11 +24,11 @@ PYTHONTRACEMALLOC=0
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# api
 | 
					# api
 | 
				
			||||||
 | 
					
 | 
				
			||||||
FUNKWHALE_SPA_HTML_ROOT=http://nginx/
 | 
					FUNKWHALE_SPA_HTML_ROOT=${FUNKWHALE_PROTOCOL}://${FUNKWHALE_DOMAIN}
 | 
				
			||||||
LDAP_ENABLED=False
 | 
					LDAP_ENABLED=False
 | 
				
			||||||
BROWSABLE_API_ENABLED=True
 | 
					BROWSABLE_API_ENABLED=True
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# api + nginx
 | 
					# api + web
 | 
				
			||||||
 | 
					
 | 
				
			||||||
STATIC_ROOT=/staticfiles
 | 
					STATIC_ROOT=/staticfiles
 | 
				
			||||||
MEDIA_ROOT=/data/media
 | 
					MEDIA_ROOT=/data/media
 | 
				
			||||||
| 
						 | 
					@ -36,12 +36,12 @@ MEDIA_ROOT=/data/media
 | 
				
			||||||
# api + Typesense
 | 
					# api + Typesense
 | 
				
			||||||
TYPESENSE_API_KEY=apikey
 | 
					TYPESENSE_API_KEY=apikey
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# front
 | 
					# app
 | 
				
			||||||
 | 
					
 | 
				
			||||||
HOST=0.0.0.0
 | 
					HOST=0.0.0.0
 | 
				
			||||||
VUE_PORT=8080
 | 
					VUE_PORT=8080
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# nginx
 | 
					# web
 | 
				
			||||||
 | 
					
 | 
				
			||||||
NGINX_MAX_BODY_SIZE=10G
 | 
					NGINX_MAX_BODY_SIZE=10G
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -30,10 +30,10 @@ services:
 | 
				
			||||||
      service: worker
 | 
					      service: worker
 | 
				
			||||||
    <<: *django
 | 
					    <<: *django
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  nginx:
 | 
					  web:
 | 
				
			||||||
    extends:
 | 
					    extends:
 | 
				
			||||||
      file: ./compose/app.nginx.yml
 | 
					      file: ./compose/app.nginx.yml
 | 
				
			||||||
      service: nginx
 | 
					      service: web
 | 
				
			||||||
    depends_on:
 | 
					    depends_on:
 | 
				
			||||||
      app:
 | 
					      app:
 | 
				
			||||||
        condition: service_healthy
 | 
					        condition: service_healthy
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,5 +1,5 @@
 | 
				
			||||||
services:
 | 
					services:
 | 
				
			||||||
  nginx:
 | 
					  web:
 | 
				
			||||||
    image: nginx
 | 
					    image: nginx
 | 
				
			||||||
    networks:
 | 
					    networks:
 | 
				
			||||||
      - internal
 | 
					      - internal
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue