diff options
| author |   Trevor Bramwell <tbramwell@linuxfoundation.org> | 2018-10-05 17:00:45 -0700 |
|---|---|---|
| committer | Trevor Bramwell <tbramwell@linuxfoundation.org> | 2018-10-05 17:00:45 -0700 |
| commit | 2ea6c6198bc2aac73b04edad8c5a10d5534cdc2e (patch) | |
| tree | 8fccfe637f23ebcf0478877f826ecd0da3d6616c /dashboard | |
| parent | 9bab3b54b4382938f6a0347e8f47b1825c4f869c (diff) | |
Update Postgres Usage
Setting POSTGRES_{DB,USER,PASSWORD} variables removes the need to volume
mount the script for specifying the user and database.
Change-Id: I7ee958c8d36702d1afd701e026b642ac84440ee8
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
Diffstat (limited to 'dashboard')
| -rw-r--r-- | dashboard/config.env.sample | 3 | ||||
| -rwxr-xr-x | dashboard/config/postgres/docker-entrypoint-initdb.d/pharos_dashboard.sh | 14 | ||||
| -rw-r--r-- | dashboard/docker-compose.yml | 1 |
3 files changed, 3 insertions, 15 deletions
diff --git a/dashboard/config.env.sample b/dashboard/config.env.sample index a2675ef..5072779 100644 --- a/dashboard/config.env.sample +++ b/dashboard/config.env.sample @@ -3,6 +3,9 @@ DASHBOARD_URL=http://labs.opnfv.org # SECURITY WARNING: don't run with debug turned on in production! DEBUG=False +POSTGRES_DB=sample_name +POSTGRES_USER=sample_user +POSTGRES_PASSWORD=sample_pass DB_NAME=sample_name DB_USER=sample_user DB_PASS=sample_pass diff --git a/dashboard/config/postgres/docker-entrypoint-initdb.d/pharos_dashboard.sh b/dashboard/config/postgres/docker-entrypoint-initdb.d/pharos_dashboard.sh deleted file mode 100755 index 526228a..0000000 --- a/dashboard/config/postgres/docker-entrypoint-initdb.d/pharos_dashboard.sh +++ /dev/null @@ -1,14 +0,0 @@ -############################################################################## -# Copyright (c) 2016 Max Breitenfeldt and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - - -#!/bin/env bash - -psql -U postgres -c "CREATE USER $DB_USER PASSWORD '$DB_PASS'" -psql -U postgres -c "CREATE DATABASE $DB_NAME OWNER $DB_USER" diff --git a/dashboard/docker-compose.yml b/dashboard/docker-compose.yml index 63a778b..4e57ff3 100644 --- a/dashboard/docker-compose.yml +++ b/dashboard/docker-compose.yml @@ -49,7 +49,6 @@ services: container_name: ps01 env_file: config.env volumes: - - ./config/postgres/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d - pharos-data:/var/lib/postgresql/data rabbitmq: |