use TTRSS_DB_* variables instead of POSTGRES_* to set database configuration

legacy-php5
Andrew Dolgov 4 years ago
parent ef24fccd6f
commit b601ee719c

@ -1,8 +1,9 @@
# Copy this file to .env before building the container. # Copy this file to .env before building the container.
# Put any local modifications here. # Put any local modifications here.
POSTGRES_USER=postgres TTRSS_DB_USER=postgres
POSTGRES_PASSWORD=password TTRSS_DB_NAME=postgres
TTRSS_DB_PASS=password
# This is only used by web-ssl container. # This is only used by web-ssl container.
#HTTP_HOST=localhost #HTTP_HOST=localhost

@ -4,8 +4,10 @@ services:
db: db:
image: postgres:12-alpine image: postgres:12-alpine
restart: unless-stopped restart: unless-stopped
env_file: environment:
- .env - POSTGRES_USER=${TTRSS_DB_USER}
- POSTGRES_PASSWORD=${TTRSS_DB_PASS}
- POSTGRES_DB=${TTRSS_DB_NAME}
volumes: volumes:
- db:/var/lib/postgresql/data - db:/var/lib/postgresql/data
@ -16,10 +18,6 @@ services:
restart: unless-stopped restart: unless-stopped
env_file: env_file:
- .env - .env
environment:
- TTRSS_DB_NAME=${POSTGRES_USER}
- TTRSS_DB_USER=${POSTGRES_USER}
- TTRSS_DB_PASS=${POSTGRES_PASSWORD}
volumes: volumes:
- app:/var/www/html - app:/var/www/html
- ./config.d:/opt/tt-rss/config.d:ro - ./config.d:/opt/tt-rss/config.d:ro
@ -31,10 +29,6 @@ services:
context: context:
./app ./app
restart: unless-stopped restart: unless-stopped
environment:
- TTRSS_DB_NAME=${POSTGRES_USER}
- TTRSS_DB_USER=${POSTGRES_USER}
- TTRSS_DB_PASS=${POSTGRES_PASSWORD}
volumes: volumes:
- backups:/backups - backups:/backups
- app:/var/www/html - app:/var/www/html
@ -49,10 +43,6 @@ services:
restart: unless-stopped restart: unless-stopped
env_file: env_file:
- .env - .env
environment:
- TTRSS_DB_NAME=${POSTGRES_USER}
- TTRSS_DB_USER=${POSTGRES_USER}
- TTRSS_DB_PASS=${POSTGRES_PASSWORD}
volumes: volumes:
- app:/var/www/html - app:/var/www/html
- ./config.d:/opt/tt-rss/config.d:ro - ./config.d:/opt/tt-rss/config.d:ro

Loading…
Cancel
Save