Missed some file from commit of docker support for mysql, react-ui and common-data-service

Author: ujjavaldesai07

.gitignore

@@ -1,5 +1,7 @@
 # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
 
+.env
+
 # Client
 # dependencies
 /client/node_modules

client/.dockerignore

@@ -0,0 +1,2 @@
+node_modules
+npm-debug.log

client/Dockerfile

@@ -9,12 +9,14 @@ WORKDIR /usr/src/app
 # Install app dependencies
 # A wildcard is used to ensure both package.json AND package-lock.json are copied
 # where available (npm@5+)
-COPY package*.json ./
+COPY ./client/package*.json ./
 
 RUN npm install
 
 # Bundle app source
 COPY . .
 
+#RUN yarn install
+
 # Initiate npm start
 CMD [ "npm", "start" ]

client/package.json

@@ -34,8 +34,10 @@
     "swiper": "^5.4.2"
   },
   "scripts": {
-    "start": "env-cmd -f .env react-scripts start",
-    "build": "env-cmd -f .env react-scripts build",
+    "start": "react-scripts start",
+    "build": "react-scripts build",
+    "start_dev": "./node_modules/.bin/env-cmd -f .env react-scripts start",
+    "build_dev": "./node_modules/.bin/env-cmd -f .env react-scripts build",
     "test": "react-scripts test",
     "eject": "react-scripts eject"
   },

client/public/index.html

@@ -22,7 +22,7 @@
       Only files inside the `public` folder can be referenced from the HTML.
 
       Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
-      work correctly both with react-ui-side routing and a non-root public URL.
+      work correctly both with client-side routing and a non-root public URL.
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
     <title>React App</title>

client/src/api/service_api.js

@@ -1,5 +1,7 @@
 import axios from 'axios';
 
+const {REACT_APP_COMMON_DATA_SERVICE_IP, REACT_APP_COMMON_DATA_SERVICE_PORT} = process.env
+
 export const paymentServiceAPI = axios.create({
     baseURL: 'http://localhost:9050'
 })
@@ -9,5 +11,5 @@ export const authServiceAPI = axios.create({
 })
 
 export const commonServiceAPI = axios.create({
-    baseURL: 'http://localhost:9000'
+    baseURL: `http://${REACT_APP_COMMON_DATA_SERVICE_IP}:${REACT_APP_COMMON_DATA_SERVICE_PORT}`
 })

client/src/components/app.js

@@ -16,7 +16,7 @@ import {CancelPayment} from "./routes/cancelPayment";
 import {BadRequest} from "./ui/error/badRequest";
 
 const App = () => {
-    log.info(`[App]: Rendering App Component window`)
+    log.info(`[App]: Rendering App Component`)
 
     return (
         <Router history={history}>

docker-compose.yml

@@ -0,0 +1,69 @@
+version: '3'
+
+services:
+  mysql-db:
+    image: mysql:8
+    container_name: mysql-db-container
+    environment:
+      MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
+      MYSQL_DATABASE: ${MYSQL_DATABASE}
+      MYSQL_USER: ${MYSQL_USER}
+      MYSQL_PASSWORD: ${MYSQL_PASSWORD}
+    volumes:
+        - ./mysql-db/user.sql:/docker-entrypoint-initdb.d/user.sql
+    ports:
+      - 3312:3306
+    networks:
+      - spring-cloud-microservices
+
+  common-data-service:
+    build:
+      context: .
+      dockerfile: ./server/common-data-service/Dockerfile
+    container_name: common-data-service-container
+    restart: always
+    depends_on:
+      - mysql-db
+      - react-ui
+    environment:
+      - DB_HOST=${DB_HOST}
+      - DB_PORT=${DB_PORT}
+      - DB_USER=${DB_USER}
+      - DB_PASS=${DB_PASS}
+      - DB_SCHEMA=${DB_SCHEMA}
+      - ACTIVE_PROFILE=${ACTIVE_PROFILE}
+      - COMMON_DATA_SERVICE_PORT=${COMMON_DATA_SERVICE_PORT}
+    links:
+      - mysql-db:mysql
+    expose:
+      - ${COMMON_DATA_SERVICE_PORT}
+    ports:
+      - ${COMMON_DATA_SERVICE_PORT}:${COMMON_DATA_SERVICE_PORT}
+    networks:
+      - spring-cloud-microservices
+
+  react-ui:
+    build:
+      context: .
+      dockerfile: ./client/Dockerfile
+    container_name: react-service-container
+    stdin_open: true
+    restart: always
+    expose:
+      - ${REACTT_APP_PORT}
+    ports:
+      - ${REACTT_APP_PORT}:${REACTT_APP_PORT}
+    environment:
+      - REACT_APP_STRIPE_PUBLISH_KEY=${REACT_APP_STRIPE_PUBLISH_KEY}
+      - REACT_APP_COMMON_DATA_SERVICE_IP=${REACT_APP_COMMON_DATA_SERVICE_IP}
+      - REACT_APP_COMMON_DATA_SERVICE_PORT=${COMMON_DATA_SERVICE_PORT}
+    volumes:
+      - ./client:/usr/src/app
+      - /usr/src/app/node_modules
+    depends_on:
+      - mysql-db
+    networks:
+      - spring-cloud-microservices
+networks:
+  spring-cloud-microservices:
+    external: true

mysql-db/user.sql

@@ -0,0 +1 @@
+GRANT ALL PRIVILEGES ON *.* TO 'springstudent'@'%';

server/common-data-service/Dockerfile

@@ -0,0 +1,26 @@
+# Docker multi-stage build
+
+# 1. Building the App with Maven
+FROM maven:3-jdk-11
+
+ADD ./server/common-data-service /common_data_service_staging
+
+WORKDIR /common_data_service_staging
+
+# Just echo so we can see, if everything is there
+RUN ls -l
+
+# Run Maven build
+RUN mvn clean install -DskipTests
+
+# 2. Just using the build artifact and then removing the build-container
+FROM openjdk:11-jdk
+
+VOLUME /tmp
+
+# Add Spring Boot app.jar to Container
+COPY --from=0 /common_data_service_staging/target/common-data-service.jar common-data-service.jar
+
+# Fire up our Spring Boot app by default
+CMD ["sh", "-c", "java -Dserver.port=$COMMON_DATA_SERVICE_PORT -Xmx300m -Xss512k -XX:CICompilerCount=2 -Dfile.encoding=UTF-8 -XX:+UseContainerSupport -Dspring.profiles.active=$ACTIVE_PROFILE -Djava.security.egd=file:/dev/./urandom -jar common-data-service.jar" ]
+