浏览代码

Set an explicit username and password for the db service

Peter Valdez 5 年之前
父节点
当前提交
a8888af480
共有 4 个文件被更改,包括 8 次插入5 次删除
  1. 4 1
      docker-compose.yml
  2. 1 1
      result/server.js
  3. 2 2
      worker/src/Worker/Program.cs
  4. 1 1
      worker/src/main/java/worker/Worker.java

+ 4 - 1
docker-compose.yml

@@ -43,6 +43,9 @@ services:
   db:
   db:
     image: postgres:9.4
     image: postgres:9.4
     container_name: db
     container_name: db
+    environment:
+      POSTGRES_USER: "postgres"
+      POSTGRES_PASSWORD: "postgres"
     volumes:
     volumes:
       - "db-data:/var/lib/postgresql/data"
       - "db-data:/var/lib/postgresql/data"
     networks:
     networks:
@@ -53,4 +56,4 @@ volumes:
 
 
 networks:
 networks:
   front-tier:
   front-tier:
-  back-tier:
+  back-tier:

+ 1 - 1
result/server.js

@@ -24,7 +24,7 @@ io.sockets.on('connection', function (socket) {
 });
 });
 
 
 var pool = new pg.Pool({
 var pool = new pg.Pool({
-  connectionString: 'postgres://postgres@db/postgres'
+  connectionString: 'postgres://postgres:postgres@db/postgres'
 });
 });
 
 
 async.retry(
 async.retry(

+ 2 - 2
worker/src/Worker/Program.cs

@@ -16,7 +16,7 @@ namespace Worker
         {
         {
             try
             try
             {
             {
-                var pgsql = OpenDbConnection("Server=db;Username=postgres;");
+                var pgsql = OpenDbConnection("Server=db;Username=postgres;Password=postgres;");
                 var redisConn = OpenRedisConnection("redis");
                 var redisConn = OpenRedisConnection("redis");
                 var redis = redisConn.GetDatabase();
                 var redis = redisConn.GetDatabase();
 
 
@@ -46,7 +46,7 @@ namespace Worker
                         if (!pgsql.State.Equals(System.Data.ConnectionState.Open))
                         if (!pgsql.State.Equals(System.Data.ConnectionState.Open))
                         {
                         {
                             Console.WriteLine("Reconnecting DB");
                             Console.WriteLine("Reconnecting DB");
-                            pgsql = OpenDbConnection("Server=db;Username=postgres;");
+                            pgsql = OpenDbConnection("Server=db;Username=postgres;Password=postgres;");
                         }
                         }
                         else
                         else
                         { // Normal +1 vote requested
                         { // Normal +1 vote requested

+ 1 - 1
worker/src/main/java/worker/Worker.java

@@ -72,7 +72,7 @@ class Worker {
 
 
       while (conn == null) {
       while (conn == null) {
         try {
         try {
-          conn = DriverManager.getConnection(url, "postgres", "");
+          conn = DriverManager.getConnection(url, "postgres", "postgres");
         } catch (SQLException e) {
         } catch (SQLException e) {
           System.err.println("Waiting for db");
           System.err.println("Waiting for db");
           sleep(1000);
           sleep(1000);