Merge pull request #1039 from UniversityOfHelsinkiCS/trunk

use DB_URL insteadof shit
UniversityOfHelsinkiCS · Jun 18, 2019 · 947a0de · 947a0de
2 parents d30529a + d00182c
commit 947a0de
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -258,9 +258,6 @@ services:
       DB_URL: postgres://postgres@db:5432/tkt_oodi
       TEST_DB: postgres://postgres@db:5432/tkt_oodi_test
       TEST_DB_SCHEMA: updater_test
-      HOST: db
-      USER: postgres
-      DBNAME: tkt_oodi
       DB_SCHEMA_KONE: kone_data
 
 

diff --git a/services/backend/updater_writer/database/dump_database.js b/services/backend/updater_writer/database/dump_database.js
@@ -4,8 +4,8 @@ const { sync } = require('./force_sync_database')
 const { DB_SCHEMA } = require('../conf-backend')
 
 const dumpDatabase = async () => {
-  const { USER, HOST, DBNAME } = process.env
-  const dumpOptions = ['-Fc', `-U${USER}`, `--host=${HOST}`, `-n${DB_SCHEMA}`, `${DBNAME}`]
+  const { DB_URL } = process.env
+  const dumpOptions = ['-Fc', `-n${DB_SCHEMA}`, `${DB_URL}`]
   console.log(dumpOptions)
   const dumpProcess = spawn('pg_dump', dumpOptions, { stdio: ['ignore', 'pipe', 'inherit'] })
   dumpProcess.on('error', (err) => {