From d9b0c1da1c3efedbb66c1a10e705e68f973a696c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chimanshu=E2=80=9D?= <himanshu@signoz.io>
Date: Wed, 20 Jan 2021 03:59:58 +0530
Subject: [PATCH] Create docker image and tag

---
 deploy/docker/docker-compose.yaml |  2 +-
 frontend/Dockerfile               | 34 +++++++++++++++++++++++--------
 frontend/README.md                | 24 ++++++++++++++++++++++
 frontend/docker-compose.yml       |  1 +
 frontend/src/constants/env.ts     |  3 ++-
 5 files changed, 53 insertions(+), 11 deletions(-)

diff --git a/deploy/docker/docker-compose.yaml b/deploy/docker/docker-compose.yaml
index 22906b0406..0b257d7fa8 100644
--- a/deploy/docker/docker-compose.yaml
+++ b/deploy/docker/docker-compose.yaml
@@ -169,7 +169,7 @@ services:
 
     
   frontend:
-    image: signoz/frontend:0.1.7
+    image: 7296823551/signoz:latest
     container_name: frontend
 
     depends_on:
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
index 2f9361c633..5bb46ad870 100644
--- a/frontend/Dockerfile
+++ b/frontend/Dockerfile
@@ -1,15 +1,31 @@
-FROM node:12.20.1-alpine3.9
-
-
-ADD ./ ./frontend
+# stage1 as builder
+FROM node:14-alpine as builder
 
 WORKDIR /frontend
 
-RUN yarn && yarn build
-RUN yarn global add serve
+# copy the package.json to install dependencies
+COPY package.json ./
 
-ARG PORT=3000
+# Install the dependencies and make the folder
+RUN yarn install 
 
-EXPOSE $PORT
+COPY . .
 
-CMD ["serve", "-s","build"]
\ No newline at end of file
+# Build the project and copy the files
+RUN yarn build
+
+FROM nginx:1.15-alpine
+
+#!/bin/sh
+
+COPY conf/default.conf /etc/nginx/conf.d/default.conf
+
+## Remove default nginx index page
+RUN rm -rf /usr/share/nginx/html/*
+
+# Copy from the stahg 1
+COPY --from=builder /frontend/build /usr/share/nginx/html
+
+EXPOSE 3000
+
+ENTRYPOINT ["nginx", "-g", "daemon off;"]
\ No newline at end of file
diff --git a/frontend/README.md b/frontend/README.md
index 02aac3f6ea..7d49534da5 100644
--- a/frontend/README.md
+++ b/frontend/README.md
@@ -1,3 +1,27 @@
+
+ # Docker
+ **Building image**
+
+```docker-compose up`` 
+/ This will also run
+
+or
+```docker build . -t tagname```
+
+  
+
+**Tag to remote url- Introduce versinoing later on**
+
+```
+docker tag signoz/frontend:latest 7296823551/signoz:latest
+```
+
+  **Running locally**
+
+```
+docker-compose up
+```
+
 # Getting Started with Create React App
 
 This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
diff --git a/frontend/docker-compose.yml b/frontend/docker-compose.yml
index b102e15577..4e9043fb08 100644
--- a/frontend/docker-compose.yml
+++ b/frontend/docker-compose.yml
@@ -2,5 +2,6 @@ version: "3.9"
 services:
   web:
     build: .
+    image: signoz/frontend:latest
     ports:
       - "3000:3000"
\ No newline at end of file
diff --git a/frontend/src/constants/env.ts b/frontend/src/constants/env.ts
index c350e6d922..eb3d981d23 100644
--- a/frontend/src/constants/env.ts
+++ b/frontend/src/constants/env.ts
@@ -1,3 +1,4 @@
 export const ENVIRONMENT = {
-	baseURL: "http://104.211.113.204:8080",
+	baseURL: "/api",
+	// baseURL: "http://104.211.113.204:8080",
 };