chore: Docker setup complete

dev-ashishk · Ashish Kumar · commit 0753abb14eb4 · 2020-05-19T06:40:53.000+05:30
chore: removed extra steps from build.sh
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,8 @@
+/node_modules
+/client-build
+/server-build
+/.git
+.gitignore
+/env
+.env
+dev.env
diff --git a/.env b/.env
@@ -1,3 +1,4 @@
 PORT=3000
 API_URL=https://hn.algolia.com/
-HOST_URL=http://localhost:3000
+HOST_URL=http://localhost:3000
+TAG=latest
diff --git a/.eslintignore b/.eslintignore
@@ -1,4 +1,7 @@
 /client-build
 /node_modules
 /server-build
-.gitignore
+.gitignore
+.travis.yml
+docker-compose.yml
+Dockerfile
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -0,0 +1,20 @@
+
+on: push
+name: lint
+jobs:
+  build-and-publish:
+    name: build and publish
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [10.x]
+    steps:
+      - uses: actions/checkout@master
+      - name: npm install
+        uses: actions/npm@master
+        with:
+          args: install
+      - name: npm lint
+        uses: actions/npm@master
+        with:
+          args: run lint
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,15 @@
+ARG PORT
+FROM node:10-alpine
+RUN mkdir /app && chown -R node:node /app
+WORKDIR /app
+COPY --chown=node:node package*.json ./
+RUN npm install --no-optional && npm cache clean --force
+ENV PATH /app/node_modules/.bin:$PATH
+RUN npm rebuild node-sass
+USER node
+COPY --chown=node:node . .
+
+RUN npm run build
+
+EXPOSE $PORT
+CMD [ "node", "server-build/server.js" ]
diff --git a/build.sh b/build.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+echo "------ Building Docker Image -------";
+
+docker-compose build --no-cache
diff --git a/client/components/StoryList/index.js b/client/components/StoryList/index.js
@@ -32,7 +32,7 @@ class StoryList extends Component {
         const { search } = props.location;
         const qParams = parseQueryString(search);
         try {
-            if (parseInt(qParams.page, 10) !== parseInt(state.currPage, 10)) {
+            if (qParams.page && (parseInt(qParams.page, 10) !== parseInt(state.currPage, 10))) {
                 props.fetchStories(qParams.page);
                 return {
                     currPage: qParams.page
diff --git a/client/config/api.js b/client/config/api.js
@@ -1,7 +1,7 @@
 import axios from "axios";
 
 const axiosInstance = axios.create({
-    baseURL: `${process.env.API_URL}/api/v1`
+    baseURL: "/api/v1"
 });
 
 export default axiosInstance;
diff --git a/dev.env b/dev.env
@@ -1,3 +1,4 @@
 PORT=3000
 API_URL=https://hn.algolia.com/
-HOST_URL=http://localhost:3000
+HOST_URL=http://localhost:3000
+TAG=latest
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -0,0 +1,15 @@
+version: "3.8"
+
+services:
+  web:
+    env_file: ./.env
+    image: "web:${TAG}"
+    ports:
+      - 8080:${PORT}
+    restart: always
+    build:
+      context: .
+      dockerfile: Dockerfile
+      args: 
+        - PORT:${PORT}
+        - API_URL:${API_URL}
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
         "dev-build-server": "webpack --config webpack/dev/webpack.server.js",
         "dev:build-client": "webpack --config webpack/dev/webpack.client.js --watch",
         "dev:server": "nodemon --watch server client --exec \"npm run dev-build-server && node --inspect server-build/server.js\"",
-        "build": "npm run lint && npm run prod:build-client && npm run prod:build-server",
+        "build": "npm run prod:build-client && npm run prod:build-server",
         "prod:build-server": "NODE_ENV=production webpack --config webpack/production/webpack.server.js",
         "prod:build-client": "NODE_ENV=production webpack --config webpack/production/webpack.client.js",
         "serve": "NODE_ENV=production node server-build/server.js",
@@ -79,6 +79,7 @@
         "express": "^4.17.1",
         "express-http-proxy": "^1.6.0",
         "history": "^4.10.1",
+        "http-proxy-middleware": "^1.0.3",
         "isomorphic-style-loader": "^5.1.0",
         "npm-run-all": "^4.1.5",
         "react": "^16.13.1",
diff --git a/server/server.js b/server/server.js
@@ -5,6 +5,7 @@ import * as bodyParser from "body-parser";
 import cookieParser from "cookie-parser";
 import ServeWeb from "./helpers/ServeWeb";
 
+const { createProxyMiddleware } = require("http-proxy-middleware");
 const compression = require("compression");
 
 const app = express();
@@ -18,6 +19,8 @@ app.use(compression({
     level: 6, // set compression level from 1 to 9 (6 by default)
     filter: shouldCompress // set predicate to determine whether to compress
 }));
+
+
 app.use("/static", express.static(Path.resolve(__dirname, "./../client-build")));
 app.use("/assets/", express.static(Path.resolve(__dirname, "./../assets")));
 app.use(express.static(Path.resolve(__dirname, "./../public")));
@@ -33,6 +36,14 @@ app.use(bodyParser.json({}));
 app.use(bodyParser.urlencoded({ extended: false }));
 app.use(cookieParser());
 
+process.env.NODE_TLS_REJECT_UNAUTHORIZED = "0";
+const apiProxy = createProxyMiddleware("/api/v1", {
+    target: `${process.env.API_URL}`,
+    // secure: false,
+    changeOrigin: true
+});
+app.use(apiProxy);
+
 
 app.get("/*", ServeWeb);
 
diff --git a/webpack/dev/webpack.base.js b/webpack/dev/webpack.base.js
@@ -19,7 +19,7 @@ module.exports = {
         new LoadablePlugin(),
         new CleanWebpackPlugin(),
         new Dotenv({
-            path: "./env/dev.env", // load this now instead of the ones in '.env'
+            path: "./dev.env", // load this now instead of the ones in '.env'
             safe: true, // load '.env.example' to verify the '.env' variables are all set. Can also be a string to a different file.
             systemvars: true, // load all the predefined 'process.env' variables which will trump anything local per dotenv specs.
             silent: true, // hide any errors
diff --git a/webpack/production/webpack.base.js b/webpack/production/webpack.base.js
@@ -21,7 +21,7 @@ module.exports = {
         new LoadablePlugin(),
         new CleanWebpackPlugin(),
         new Dotenv({
-            path: "./env/prod.env", // load this now instead of the ones in '.env'
+            path: "./.env", // load this now instead of the ones in '.env'
             safe: true, // load '.env.example' to verify the '.env' variables are all set. Can also be a string to a different file.
             systemvars: true, // load all the predefined 'process.env' variables which will trump anything local per dotenv specs.
             silent: true, // hide any errors
