merge conflict

Author: didinj

Dockerfile

@@ -0,0 +1,18 @@
+FROM node:10-slim
+
+RUN apt-get update \
+    && mkdir -p /usr/share/man/man1 \
+    && mkdir -p /usr/share/man/man7 \
+    && apt-get install -y --no-install-recommends postgresql-client libpq-dev \
+    && rm -rf /var/lib/apt/lists/* \
+    && apt-get clean
+
+WORKDIR /usr/src/app
+
+COPY package* ./
+
+RUN npm install -g
+
+COPY . ./
+
+CMD npm start

bin/www

@@ -7,6 +7,13 @@
 var app = require('../app');
 var debug = require('debug')('node-sequelize:server');
 var http = require('http');
+var models = require('../models');
+
+/**
+ * Sync Database
+ */
+
+models.sequelize.sync()
 
 /**
  * Get port from environment and store in Express.

config/config.js

@@ -0,0 +1,25 @@
+const creds = {
+  development: {
+    username: process.env.DB_USERNAME,
+    password: process.env.DB_PASSWORD,
+    database: process.env.DB_NAME,
+    host: process.env.DB_HOSTNAME,
+    dialect: 'postgresql'
+  },
+  test: {
+    username: process.env.DB_USERNAME,
+    password: process.env.DB_PASSWORD,
+    database: process.env.DB_NAME,
+    host: process.env.DB_HOSTNAME,
+    dialect: 'postgresql'
+  },
+  production: {
+    username: process.env.DB_USERNAME,
+    password: process.env.DB_PASSWORD,
+    database: process.env.DB_NAME,
+    host: process.env.DB_HOSTNAME,
+    dialect: 'postgresql'
+  }
+};
+
+module.exports = creds;

config/config.json

@@ -0,0 +1,27 @@
+version: '2.1'
+
+services:
+  api:
+    build: .
+    environment:
+      DB_USERNAME: postgres
+      DB_PASSWORD: test
+      DB_NAME: test
+      DB_HOSTNAME: db
+    ports:
+      - 3000:3000
+    depends_on:
+      db:
+        condition: service_healthy
+  db:
+    image: postgres:10
+    restart: always
+    environment:
+      POSTGRES_PASSWORD: test
+      POSTGRES_DB: test
+      ALLOW_IP_RANGE: 0.0.0.0/0
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres"]
+      interval: 10s
+      timeout: 5s
+      retries: 5