Merge pull request #85 from wednesday-solutions/feat/layered-docker-images

alichherawalla · web-flow · commit ccb10b76c71e · 2022-08-11T15:00:19.000+05:30
feat: add support for a layered docker image
diff --git a/.babelrc b/.babelrc
@@ -1,8 +1,7 @@
 {
     "presets": [
     "@babel/preset-env",
-    "@babel/preset-flow",
-    "@babel/preset-react"
+    "@babel/preset-flow"
 ],
   "plugins": [
     "@babel/plugin-proposal-throw-expressions",
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1 @@
+node_modules
diff --git a/.env.docker b/.env.docker
@@ -0,0 +1,12 @@
+DB_URI=postgres://reporting_dashboard_role:reportingdashboard123@db_postgres:5432/reporting_dashboard_dev
+POSTGRES_HOST=db_postgres
+POSTGRES_DB=reporting_dashboard_dev
+POSTGRES_USER=reporting_dashboard_role
+POSTGRES_PASSWORD=reportingdashboard123
+POSTGRES_PORT=5432
+ACCESS_TOKEN_SECRET=4cd7234152590dcfe77e1b6fc52e84f4d30c06fddadd0dd2fb42cbc51fa14b1bb195bbe9d72c9599ba0c6b556f9bd1607a8478be87e5a91b697c74032e0ae7af
+NODE_ENV=production
+ENVIRONMENT_NAME=docker
+ACCESS_TOKEN_SECRET=4cd7234152590dcfe77e1b6fc52e84f4d30c06fddadd0dd2fb42cbc51fa14b1bb195bbe9d72c9599ba0c6b556f9bd1607a8478be87e5a91b697c74032e0ae7af
+REDIS_DOMAIN=redis
+REDIS_PORT=6379
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -23,6 +23,7 @@ module.exports = {
     'key-spacing': [2, { beforeColon: false, afterColon: true }],
     'arrow-parens': ['error', 'as-needed'],
     'arrow-body-style': [2, 'as-needed'],
+
     'class-methods-use-this': 0,
     'import/imports-first': 0,
     'import/newline-after-import': 0,
@@ -40,8 +41,8 @@ module.exports = {
     'no-use-before-define': 0,
     'prefer-template': 2,
     'require-yield': 0,
-    'node/handle-callback-err': 'error',
-    'prettier/prettier': ['error', prettierOptions]
+    'prettier/prettier': ['error', prettierOptions],
+    'node/handle-callback-err': ['off']
   },
   settings: {
     'import/resolver': {
diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,25 @@
 FROM node:14
-RUN mkdir -p /app
-ADD . /app
-WORKDIR /app
+ARG ENVIRONMENT_NAME
+RUN mkdir -p /app-build
+ADD . /app-build
+WORKDIR /app-build
+RUN --mount=type=cache,target=/root/.yarn YARN_CACHE_FOLDER=/root/.yarn yarn --frozen-lockfile
 RUN yarn
+RUN yarn build:${ENVIRONMENT_NAME}
+
+
+FROM node:14-alpine
+ARG ENVIRONMENT_NAME
+ENV ENVIRONMENT_NAME $ENVIRONMENT_NAME
+RUN mkdir -p /dist
+RUN apk add yarn
+RUN yarn global add sequelize@6.6.5 sequelize-cli@6.2.0 pg
+RUN yarn add shelljs bull dotenv
+ADD scripts/migrate-and-run.sh /
+ADD package.json /
+ADD . /
+COPY --from=0 /app-build/dist ./dist
+
+
 CMD ["sh", "./migrate-and-run.sh"]
 EXPOSE 9000
diff --git a/README.md b/README.md
@@ -78,7 +78,7 @@ Steps to set up database with `username` and `role` using terminal
 ### Setup and run locally using
 
 ```
-./setup-local.sh
+./scripts/setup-local.sh
 ```
 
 ### Build and run docker container locally
diff --git a/config/db.js b/config/db.js
@@ -1,34 +1,16 @@
 module.exports = {
-  local: {
-    url: process.env.DB_URI,
-    logging: true,
-    options: {
-      dialect: 'postgres',
-      pool: {
-        min: 0,
-        max: 10,
-        idle: 10000
-      },
-      define: {
-        userscored: true,
-        timestamps: false
-      }
-    }
-  },
-  development: {
-    url: process.env.DB_URI,
-    logging: true,
-    options: {
-      dialect: 'postgres',
-      pool: {
-        min: 0,
-        max: 10,
-        idle: 10000
-      },
-      define: {
-        userscored: true,
-        timestamps: false
-      }
+  url: process.env.DB_URI,
+  logging: true,
+  options: {
+    dialect: 'postgres',
+    pool: {
+      min: 0,
+      max: 10,
+      idle: 10000
+    },
+    define: {
+      userscored: true,
+      timestamps: false
     }
   }
 };
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -6,13 +6,24 @@ services:
       - 5432:5432
     restart: always
     env_file:
-      - .env.development
+      - .env.docker
+  redis:
+    image: 'redis:alpine'
+    ports:
+      - '6379:6379'
+    command: ['redis-server', '--bind', 'redis', '--port', '$REDIS_PORT']
   app:
-    build: .
+    build:
+      context: .
+      args:
+        ENVIRONMENT_NAME: ${ENVIRONMENT_NAME}
     restart: always
+    depends_on:
+      - db_postgres
+      - redis
     ports:
       - 9000:9000
     env_file:
-      - .env.development
+      - ./.env.docker
     environment:
-      ENVIRONMENT_NAME: 'development'
+      ENVIRONMENT_NAME: 'docker'
diff --git a/makefile b/makefile
@@ -0,0 +1,12 @@
+docker:
+	docker-compose --env-file ./.env.docker \
+	-f docker-compose.yml \
+	-f docker-compose.yml down
+
+	docker-compose --env-file ./.env.docker \
+	-f docker-compose.yml \
+	-f docker-compose.yml build
+
+	docker-compose --env-file ./.env.docker \
+	-f docker-compose.yml \
+	-f docker-compose.yml up
diff --git a/migrate-and-run.sh b/migrate-and-run.sh
diff --git a/package.json b/package.json
@@ -20,6 +20,7 @@
     "build:development": "export ENVIRONMENT_NAME=development && rm -rf dist && webpack --mode development --config  webpack.dev.config.js",
     "build:qa": "export ENVIRONMENT_NAME=qa && rm -rf dist && webpack --mode development --config  webpack.dev.config.js",
     "build:production": "export ENVIRONMENT_NAME=production && rm -rf dist && webpack --mode production --config webpack.prod.config.js",
+    "build:docker": "export ENVIRONMENT_NAME=docker && rm -rf dist && webpack --mode production --config webpack.prod.config.js",
     "start": "node ./dist/main.js",
     "clean": "rimraf dist",
     "format": "prettier-standard './**/**/*.js'",
@@ -45,7 +46,7 @@
     "aws-sdk": "^2.949.0",
     "axios": "^0.26.0",
     "babel-eslint": "^10.1.0",
-    "bull": "^4.7.0",
+    "bull": "^4.8.1",
     "cls-hooked": "^4.2.2",
     "cls-rtracer": "^2.6.0",
     "cors": "^2.8.5",
@@ -64,7 +65,7 @@
     "graphql-subscriptions": "^2.0.0",
     "html-webpack-plugin": "^4.5.0",
     "http": "^0.0.1-security",
-    "ioredis": "^4.28.5",
+    "ioredis": "^5.2.2",
     "jsonwebtoken": "^8.5.1",
     "loadash": "^1.0.0",
     "lodash": "^4.17.21",
@@ -102,30 +103,18 @@
     "zlib": "^1.0.5"
   },
   "devDependencies": {
-    "@babel/node": "^7.14.7",
     "@babel/plugin-proposal-throw-expressions": "^7.14.5",
-    "@babel/plugin-transform-modules-commonjs": "^7.14.5",
-    "@babel/plugin-transform-runtime": "^7.14.5",
-    "@babel/polyfill": "^7.11.5",
-    "@babel/preset-es2015": "^7.0.0-beta.53",
-    "@babel/preset-react": "^7.14.5",
-    "@babel/preset-stage-0": "^7.8.3",
-    "@babel/preset-stage-2": "^7.8.3",
-    "@babel/register": "^7.14.5",
-    "@babel/runtime": "^7.14.6",
-    "@types/jest": "^27.4.1",
-    "babel-jest": "^26.3.0",
+    "@babel/plugin-transform-runtime": "^7.18.10",
     "babel-loader": "^8.1.0",
-    "babel-plugin-root-import": "^6.5.0",
     "eslint": "7.31.0",
-    "eslint-config-prettier": "^8.3.0",
+    "eslint-config-prettier": "^8.5.0",
     "eslint-config-prettier-standard": "^4.0.1",
-    "eslint-config-standard": "^16.0.3",
-    "eslint-plugin-import": "^2.23.4",
+    "eslint-config-standard": "^17.0.0",
+    "eslint-plugin-import": "^2.26.0",
+    "eslint-plugin-n": "^15.2.4",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^3.4.0",
-    "eslint-plugin-promise": "^5.1.0",
-    "eslint-plugin-standard": "^5.0.0",
+    "eslint-plugin-prettier": "^4.2.1",
+    "eslint-plugin-promise": "^6.0.0",
     "faker": "^5.5.3",
     "jest": "^27.5.1",
     "jest-coverage-badges": "^1.1.2",
diff --git a/scripts/migrate-and-run.sh b/scripts/migrate-and-run.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+set -a . ".env.$ENVIRONMENT_NAME" set +a
+sleep 10
+echo $ENVIRONMENT_NAME
+LOCAL="local"
+if [ $ENVIRONMENT_NAME = $LOCAL ]
+then
+    npx sequelize-cli db:drop
+    npx sequelize-cli db:create
+fi
+npx sequelize-cli db:migrate
+# seed data for local builds
+if [ $ENVIRONMENT_NAME = $LOCAL ]
+then
+    for file in seeders/*
+    do
+        :
+        npx sequelize-cli db:seed --seed $file
+    done
+fi
+
+yarn start
diff --git a/scripts/setup-local.sh b/scripts/setup-local.sh
diff --git a/server/auth/index.js b/server/auth/index.js
@@ -10,7 +10,7 @@ export const handleSignUp = async (req, res) => {
     const token = getSignedToken(newUser);
     const { dataValues } = newUser;
 
-    res.json({ ...dataValues, token: token });
+    res.json({ ...dataValues, token });
   } catch (err) {
     res.json(err.message);
   }
diff --git a/server/auth/tests/index.test.js b/server/auth/tests/index.test.js
@@ -4,7 +4,7 @@ import * as AuthDoas from '@daos/auth';
 describe('handleSignUp tests', () => {
   const email = 'rohansaroha2@wednesday.is';
   const password = 1234;
-  const user = { email: email, password: password };
+  const user = { email, password };
 
   it('should ensure that it signup the user', async () => {
     const mockResponse = () => {
diff --git a/server/daos/tests/auth.test.js b/server/daos/tests/auth.test.js
@@ -6,7 +6,7 @@ describe('getUserBySign tests', () => {
   const email = 'rohansaroha2@wednesday.is';
   const password = 1234;
   const md5Password = md5(password);
-  const user = { email: email, password: md5Password };
+  const user = { email, password: md5Password };
   let mock;
 
   beforeEach(() => {
diff --git a/server/daos/tests/purchasedProducts.test.js b/server/daos/tests/purchasedProducts.test.js
@@ -18,10 +18,10 @@ describe('purchasedProducts tests', () => {
   const discount = 111;
   const deliveryDate = '"2022-07-20T17:30:15+05:30"';
   const purchasedProduct = {
-    price: price,
-    productId: productId,
-    discount: discount,
-    deliveryDate: deliveryDate
+    price,
+    productId,
+    discount,
+    deliveryDate
   };
 
   it('should insert a purchased product and call with correct params', async () => {
diff --git a/server/database/index.js b/server/database/index.js
@@ -17,6 +17,7 @@ export const getClient = force => {
       client = new Sequelize(process.env.POSTGRES_DB, process.env.POSTGRES_USER, process.env.POSTGRES_PASSWORD, {
         host: process.env.POSTGRES_HOST,
         dialectModule: pg,
+        port: process.env.POSTGRES_PORT,
         logging: isTestEnv() ? false : console.log,
         dialect: 'postgres',
         pool: {
diff --git a/server/index.js b/server/index.js
@@ -58,7 +58,7 @@ export const init = async () => {
     handlePreflightRequest, // handle pre-flight request for graphql endpoint
     isAuthenticated,
     graphqlHTTP({
-      schema: schema,
+      schema,
       graphiql: true,
       customFormatErrorFn: e => e
     })
diff --git a/server/utils/testUtils/testApp.js b/server/utils/testUtils/testApp.js
@@ -23,7 +23,7 @@ const testApp = express();
 testApp.use(
   '/graphql',
   graphqlHTTP({
-    schema: schema,
+    schema,
     graphiql: false,
     customFormatErrorFn: e => {
       if (process.env.ENVIRONMENT_NAME !== 'local') {
diff --git a/webpack.server.config.js b/webpack.server.config.js
@@ -8,8 +8,6 @@ const dotenv = require('dotenv');
 const dotEnvFile =
   process.env.ENVIRONMENT_NAME === 'production' ? `.env` : `.env.${process.env.ENVIRONMENT_NAME || 'local'}`;
 
-console.log({ dotEnvFile });
-
 const env = dotenv.config({ path: dotEnvFile }).parsed;
 
 const envKeys = {
@@ -26,11 +24,9 @@ const envKeys = {
 module.exports = (options = {}) => ({
   mode: options.mode,
   entry: options.entry,
+  node: { __dirname: true },
   optimization: options.optimization,
   devtool: 'source-map',
-  externals: {
-    bull: 'commonjs2 bull'
-  },
   module: {
     rules: [
       {
@@ -130,7 +126,7 @@ module.exports = (options = {}) => ({
       '@gql': path.resolve(__dirname, './server/gql'),
       '@config': path.resolve(__dirname, 'config')
     },
-    extensions: ['.js', '.jsx', '.react.js'],
+    extensions: ['.js'],
     mainFields: ['browser', 'jsnext:main', 'main']
   },
   target: 'node'
diff --git a/yarn.lock b/yarn.lock
