From 97daf7048b7817fd539d1b6eee9ca5fb3aff51cf Mon Sep 17 00:00:00 2001 From: cellarspoon Date: Wed, 5 Jan 2022 17:00:54 +0100 Subject: [PATCH] refactor: sort keys, use usual qoute style --- compose.yml | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/compose.yml b/compose.yml index b93a9e7..df176d3 100644 --- a/compose.yml +++ b/compose.yml @@ -14,30 +14,30 @@ services: - redis - s3 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_TEST=postgres://user:pass@${STACK_NAME}_postgres:5432/outline-test - - REDIS_URL=redis://${STACK_NAME}_redis:6379 - - URL=https://$DOMAIN - FORCE_HTTPS=true - - SECRET_KEY - - 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_AUTH_URI - OIDC_CLIENT_ID - OIDC_CLIENT_SECRET - - OIDC_AUTH_URI + - OIDC_DISPLAY_NAME + - OIDC_SCOPES - OIDC_TOKEN_URI - OIDC_USERINFO_URI - OIDC_USERNAME_CLAIM - - OIDC_DISPLAY_NAME - - OIDC_SCOPES - PGSSLMODE=disable + - REDIS_URL=redis://${STACK_NAME}_redis:6379 + - SECRET_KEY + - URL=https://$DOMAIN + - UTILS_SECRET deploy: labels: - "traefik.enable=true" @@ -49,20 +49,22 @@ services: #- "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.SSLHost=${DOMAIN}" + redis: image: redis networks: - backend + postgres: image: postgres:11 networks: - backend environment: - POSTGRES_USER: user - POSTGRES_PASSWORD: pass POSTGRES_DB: outline + POSTGRES_PASSWORD: pass + POSTGRES_USER: user volumes: - - 'postgres_data:/var/lib/postgresql/data' + - "postgres_data:/var/lib/postgresql/data" networks: proxy: