seems to be working now. apparently the command part of docker-compose

useffc · useffc · commit dee8b43dfa76 · 2018-10-28T21:57:13.000-04:00
for web takes precedence over the CMD block of the Dockerfile
diff --git a/Dockerfile b/Dockerfile
@@ -8,9 +8,7 @@ FROM node:6
 RUN mkdir /code
 ADD . /code
 RUN mkdir /code/build
-ADD . /code/builddock
 WORKDIR /code
 RUN npm install
 EXPOSE 80
-CMD ["npm", "test"]
-
+CMD ["npm", "run", "start:dev"]
diff --git a/app.js b/app.js
@@ -18,7 +18,7 @@ var cssnext = require('postcss-cssnext');
 rootRequire('config/environments')(app);
 app.set('io', require('socket.io').listen(httpServer));
 
-var conString = process.env.DATABASE_URL || "postgres://postgres@localhost/forum";
+var conString = process.env.DATABASE_URL || "postgres://postgres@db/forum";
 
 var Sequelize = require('sequelize');
 var sequelize = new Sequelize(conString);
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -4,16 +4,19 @@ services:
     build: .
     ports: 
       - 80:3000
-    command: bash -c 'while !</dev/tcp/db/5432; do sleep 1; done; npm start'
+    command: bash -c 'while !</dev/tcp/db/5432; do sleep 1; done; npm run start:dev'
     depends_on:
       - db
     environment:
-      - DATABASE_URL=postgres://postgres:password@db:5432/forum
+      - DATABASE_URL=postgres://forum@db:5432/forum
       - PORT=3000   
       - FORUM_STORAGE_ADAPTER=S3
   db:
-    image: postgres
-    environment:
-      - POSTGRES_USER=forum
-      - POSTGRES_PASSWORD=password
-      - POSTGRES_DB=forum
+    build:
+      context: .
+      dockerfile: ./Dockerfile.postgres
+      # environment:
+      #   - POSTGRES_USER=forum
+      #   - POSTGRES_DB=forum
+    # volumes:
+    #   - ./data/postgres:/var/lib/postgresql/data
diff --git a/models/Post.js b/models/Post.js
@@ -1,5 +1,5 @@
 var Sequelize = require('sequelize');
-var sequelize = new Sequelize(process.env.DATABASE_URL || "postgres://postgres@localhost/forum");
+var sequelize = new Sequelize(process.env.DATABASE_URL || "postgres://postgres@db/forum");
 
 var Post = rootRequire('models/Post.orm')(sequelize);
 
diff --git a/models/User.js b/models/User.js
@@ -1,5 +1,5 @@
 var Sequelize = require('sequelize');
-var sequelize = new Sequelize(process.env.DATABASE_URL || "postgres://postgres@localhost/forum");
+var sequelize = new Sequelize(process.env.DATABASE_URL || "postgres://postgres@db/forum");
 
 var User = rootRequire('models/User.orm')(sequelize);
 
diff --git a/test/integration/app.js b/test/integration/app.js
@@ -25,7 +25,7 @@ describe('socket communication', function(){
   before(function(done){
     // establish database connection:
     var Sequelize = require('sequelize');
-    var sequelize = new Sequelize("postgres://postgres@localhost/" + appModule.app.get('db-test'));
+    var sequelize = new Sequelize("postgres://postgres@db/" + appModule.app.get('db-test'));
 
     // pending comment
     var post = rootRequire('models/Post.orm')(sequelize);
diff --git a/test/integration/db.js b/test/integration/db.js
@@ -2,7 +2,7 @@ var assert = require('assert');
 
 var Sequelize = require('sequelize');
 
-var sequelize = new Sequelize("postgres://postgres@localhost/" + rootRequire('app').app.get('db-test'));
+var sequelize = new Sequelize("postgres://postgres@db/" + rootRequire('app').app.get('db-test'));
 
 var post = rootRequire('models/Post.orm')(sequelize);
 var user = rootRequire('models/User.orm')(sequelize);
diff --git a/test/test_helper.js b/test/test_helper.js
@@ -1,5 +1,5 @@
 if (process.env.NODE_ENV === 'test') {
-  process.env.DATABASE_URL = "postgres://postgres@localhost/forum_test";
+  process.env.DATABASE_URL = "postgres://postgres@db/forum_test";
 }
 
 require('../lib/helpers');

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`if (process.env.NODE_ENV === 'test') {`
`2`		`- process.env.DATABASE_URL = "postgres://postgres@localhost/forum_test";`
	`2`	`+ process.env.DATABASE_URL = "postgres://postgres@db/forum_test";`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`require('../lib/helpers');`