forked from coop-cloud/outline
		
	refactor: sort keys, use usual qoute style
This commit is contained in:
		
							
								
								
									
										38
									
								
								compose.yml
									
									
									
									
									
								
							
							
						
						
									
										38
									
								
								compose.yml
									
									
									
									
									
								
							@ -14,30 +14,30 @@ services:
 | 
				
			|||||||
      - redis
 | 
					      - redis
 | 
				
			||||||
      - s3
 | 
					      - s3
 | 
				
			||||||
    environment:
 | 
					    environment:
 | 
				
			||||||
 | 
					      - AWS_ACCESS_KEY_ID
 | 
				
			||||||
 | 
					      - AWS_REGION
 | 
				
			||||||
 | 
					      - AWS_S3_ACL
 | 
				
			||||||
 | 
					      - AWS_S3_FORCE_PATH_STYLE
 | 
				
			||||||
 | 
					      - AWS_S3_UPLOAD_BUCKET_NAME
 | 
				
			||||||
 | 
					      - AWS_S3_UPLOAD_BUCKET_URL
 | 
				
			||||||
 | 
					      - AWS_S3_UPLOAD_MAX_SIZE
 | 
				
			||||||
 | 
					      - AWS_SECRET_ACCESS_KEY
 | 
				
			||||||
      - DATABASE_URL=postgres://user:pass@${STACK_NAME}_postgres:5432/outline
 | 
					      - DATABASE_URL=postgres://user:pass@${STACK_NAME}_postgres:5432/outline
 | 
				
			||||||
      - DATABASE_URL_TEST=postgres://user:pass@${STACK_NAME}_postgres:5432/outline-test
 | 
					      - DATABASE_URL_TEST=postgres://user:pass@${STACK_NAME}_postgres:5432/outline-test
 | 
				
			||||||
      - REDIS_URL=redis://${STACK_NAME}_redis:6379
 | 
					 | 
				
			||||||
      - URL=https://$DOMAIN
 | 
					 | 
				
			||||||
      - FORCE_HTTPS=true
 | 
					      - FORCE_HTTPS=true
 | 
				
			||||||
      - SECRET_KEY
 | 
					      - OIDC_AUTH_URI
 | 
				
			||||||
      - UTILS_SECRET
 | 
					 | 
				
			||||||
      - AWS_ACCESS_KEY_ID
 | 
					 | 
				
			||||||
      - AWS_SECRET_ACCESS_KEY
 | 
					 | 
				
			||||||
      - AWS_REGION
 | 
					 | 
				
			||||||
      - AWS_S3_UPLOAD_BUCKET_URL
 | 
					 | 
				
			||||||
      - AWS_S3_UPLOAD_BUCKET_NAME
 | 
					 | 
				
			||||||
      - AWS_S3_UPLOAD_MAX_SIZE
 | 
					 | 
				
			||||||
      - AWS_S3_FORCE_PATH_STYLE
 | 
					 | 
				
			||||||
      - AWS_S3_ACL
 | 
					 | 
				
			||||||
      - OIDC_CLIENT_ID
 | 
					      - OIDC_CLIENT_ID
 | 
				
			||||||
      - OIDC_CLIENT_SECRET
 | 
					      - OIDC_CLIENT_SECRET
 | 
				
			||||||
      - OIDC_AUTH_URI
 | 
					      - OIDC_DISPLAY_NAME
 | 
				
			||||||
 | 
					      - OIDC_SCOPES
 | 
				
			||||||
      - OIDC_TOKEN_URI
 | 
					      - OIDC_TOKEN_URI
 | 
				
			||||||
      - OIDC_USERINFO_URI
 | 
					      - OIDC_USERINFO_URI
 | 
				
			||||||
      - OIDC_USERNAME_CLAIM
 | 
					      - OIDC_USERNAME_CLAIM
 | 
				
			||||||
      - OIDC_DISPLAY_NAME
 | 
					 | 
				
			||||||
      - OIDC_SCOPES
 | 
					 | 
				
			||||||
      - PGSSLMODE=disable  
 | 
					      - PGSSLMODE=disable  
 | 
				
			||||||
 | 
					      - REDIS_URL=redis://${STACK_NAME}_redis:6379
 | 
				
			||||||
 | 
					      - SECRET_KEY
 | 
				
			||||||
 | 
					      - URL=https://$DOMAIN
 | 
				
			||||||
 | 
					      - UTILS_SECRET
 | 
				
			||||||
    deploy:
 | 
					    deploy:
 | 
				
			||||||
      labels:
 | 
					      labels:
 | 
				
			||||||
        - "traefik.enable=true"
 | 
					        - "traefik.enable=true"
 | 
				
			||||||
@ -49,20 +49,22 @@ services:
 | 
				
			|||||||
        #- "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect"
 | 
					        #- "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect"
 | 
				
			||||||
        #- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true"
 | 
					        #- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true"
 | 
				
			||||||
        #- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
 | 
					        #- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  redis:
 | 
					  redis:
 | 
				
			||||||
    image: redis
 | 
					    image: redis
 | 
				
			||||||
    networks:
 | 
					    networks:
 | 
				
			||||||
      - backend
 | 
					      - backend
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  postgres:
 | 
					  postgres:
 | 
				
			||||||
    image: postgres:11
 | 
					    image: postgres:11
 | 
				
			||||||
    networks:
 | 
					    networks:
 | 
				
			||||||
      - backend
 | 
					      - backend
 | 
				
			||||||
    environment:
 | 
					    environment:
 | 
				
			||||||
      POSTGRES_USER: user
 | 
					 | 
				
			||||||
      POSTGRES_PASSWORD: pass
 | 
					 | 
				
			||||||
      POSTGRES_DB: outline
 | 
					      POSTGRES_DB: outline
 | 
				
			||||||
 | 
					      POSTGRES_PASSWORD: pass
 | 
				
			||||||
 | 
					      POSTGRES_USER: user
 | 
				
			||||||
    volumes:
 | 
					    volumes:
 | 
				
			||||||
      - 'postgres_data:/var/lib/postgresql/data'
 | 
					      - "postgres_data:/var/lib/postgresql/data"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
networks:
 | 
					networks:
 | 
				
			||||||
  proxy:
 | 
					  proxy:
 | 
				
			||||||
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user