diff --git a/compose.yml b/compose.yml index 4b524f6..58d0336 100644 --- a/compose.yml +++ b/compose.yml @@ -27,6 +27,7 @@ services: - AWS_SDK_LOAD_CONFIG=0 - AWS_SECRET_KEY_FILE=/run/secrets/aws_secret_key - DATABASE_PASSWORD_FILE=/run/secrets/db_password + - DATABASE_PASSWORD=pass - FORCE_HTTPS=true - PGSSLMODE=disable - REDIS_URL=redis://${STACK_NAME}_cache:6379 @@ -54,7 +55,7 @@ services: networks: - backend - db: + postgres: image: postgres:11 networks: - backend @@ -62,8 +63,8 @@ services: - db_password environment: POSTGRES_DB: outline - POSTGRES_PASSWORD_FILE: /run/secrets/db_password - POSTGRES_USER: outline + POSTGRES_PASSWORD: pass + POSTGRES_USER: user volumes: - "postgres_data:/var/lib/postgresql/data" diff --git a/entrypoint.sh.tmpl b/entrypoint.sh.tmpl index 4b67aa8..9c709f5 100644 --- a/entrypoint.sh.tmpl +++ b/entrypoint.sh.tmpl @@ -12,8 +12,8 @@ export GOOGLE_CLIENT_SECRET=$(cat /run/secrets/google_client_secret) export UTILS_SECRET=$(cat /run/secrets/utils_secret) export SECRET_KEY=$(cat /run/secrets/secret_key) -export DATABASE_PASSWORD=$(cat /run/secrets/db_password) -export DATABASE_URL="postgres://outline:${DATABASE_PASSWORD}@${STACK_NAME}_db:5432/outline" +#export DATABASE_PASSWORD=$(cat /run/secrets/db_password) +export DATABASE_URL="postgres://user:${DATABASE_PASSWORD}@${STACK_NAME}_postgres:5432/outline" /usr/local/bin/yarn db:migrate --env=production-ssl-disabled /usr/local/bin/yarn start "$@"