From a8888af4805cf705c12b082083f2635fe036e8f9 Mon Sep 17 00:00:00 2001
From: Peter Valdez <peter@shipyard.build>
Date: Sat, 15 Feb 2020 23:45:28 -0500
Subject: [PATCH] Set an explicit username and password for the db service

---
 docker-compose.yml                      | 5 ++++-
 result/server.js                        | 2 +-
 worker/src/Worker/Program.cs            | 4 ++--
 worker/src/main/java/worker/Worker.java | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 5417f7c..00955d8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -43,6 +43,9 @@ services:
   db:
     image: postgres:9.4
     container_name: db
+    environment:
+      POSTGRES_USER: "postgres"
+      POSTGRES_PASSWORD: "postgres"
     volumes:
       - "db-data:/var/lib/postgresql/data"
     networks:
@@ -53,4 +56,4 @@ volumes:
 
 networks:
   front-tier:
-  back-tier:
\ No newline at end of file
+  back-tier:
diff --git a/result/server.js b/result/server.js
index d15a165..c4b9e90 100644
--- a/result/server.js
+++ b/result/server.js
@@ -24,7 +24,7 @@ io.sockets.on('connection', function (socket) {
 });
 
 var pool = new pg.Pool({
-  connectionString: 'postgres://postgres@db/postgres'
+  connectionString: 'postgres://postgres:postgres@db/postgres'
 });
 
 async.retry(
diff --git a/worker/src/Worker/Program.cs b/worker/src/Worker/Program.cs
index e8ca4c1..e6c66d2 100644
--- a/worker/src/Worker/Program.cs
+++ b/worker/src/Worker/Program.cs
@@ -16,7 +16,7 @@ namespace Worker
         {
             try
             {
-                var pgsql = OpenDbConnection("Server=db;Username=postgres;");
+                var pgsql = OpenDbConnection("Server=db;Username=postgres;Password=postgres;");
                 var redisConn = OpenRedisConnection("redis");
                 var redis = redisConn.GetDatabase();
 
@@ -46,7 +46,7 @@ namespace Worker
                         if (!pgsql.State.Equals(System.Data.ConnectionState.Open))
                         {
                             Console.WriteLine("Reconnecting DB");
-                            pgsql = OpenDbConnection("Server=db;Username=postgres;");
+                            pgsql = OpenDbConnection("Server=db;Username=postgres;Password=postgres;");
                         }
                         else
                         { // Normal +1 vote requested
diff --git a/worker/src/main/java/worker/Worker.java b/worker/src/main/java/worker/Worker.java
index 040c1a2..8121430 100644
--- a/worker/src/main/java/worker/Worker.java
+++ b/worker/src/main/java/worker/Worker.java
@@ -72,7 +72,7 @@ class Worker {
 
       while (conn == null) {
         try {
-          conn = DriverManager.getConnection(url, "postgres", "");
+          conn = DriverManager.getConnection(url, "postgres", "postgres");
         } catch (SQLException e) {
           System.err.println("Waiting for db");
           sleep(1000);