docker update

docker-compose.yml

@@ -1,26 +1,54 @@
-version: '3.1'
+version: '3.8'
 
 services:
-  cmc-new-backend:
+  backend:
+    build: backend
+    restart: always
+    environment:
+      MYSQL_HOST: db
+      MYSQL_USER: support_portal_user
+      MYSQL_PASSWORD: support_portal_password
+      MYSQL_DATABASE: support-portal
+    networks:
+      - angular-spring
+      - spring-mysql
+    depends_on:
+      db:
+        condition: service_healthy
+
+  db:
+    image: mysql:8.0.19
+    environment:
+      MYSQL_USER: support_portal_user
+      MYSQL_PASSWORD: support_portal_password
+      MYSQL_DATABASE: support-portal
+      MYSQL_ROOT_PASSWORD: root_password  # required for MySQL root access
+    restart: always
+    healthcheck:
+      test: ["CMD", "mysqladmin", "ping", "-h", "127.0.0.1", "--silent"]
+      interval: 3s
+      retries: 5
+      start_period: 30s
+    volumes:
+      - db-data:/var/lib/mysql
+    networks:
+      - spring-mysql
+
+  frontend:
     build:
-      context: ./support-portal-backend
+      context: support-portal-frontend
       dockerfile: Dockerfile
     restart: always
     ports:
-      - "8070:8080"
+      - "8072:80"
-    environment:
-      - DATABASE_HOST=mysql-common-mysql-1
-      - SPRING_DATASOURCE_URL=jdbc:mysql://mysql-common-mysql-1:3306/demo
-      - SPRING_DATASOURCE_USERNAME=youruser
-      - SPRING_DATASOURCE_PASSWORD=youruserpassword
     networks:
-      - cmc-forntend
+      - angular-spring
-      - mysql-common_mynetwork
+    depends_on:
+      - backend
 
 volumes:
   db-data: {}
 
 networks:
-  cmc-forntend: {}
+  angular-spring: {}
-  mysql-common_mynetwork:
+  spring-mysql: {}
-    external: true

support-portal-frontend/Dockerfile

@@ -14,10 +14,6 @@ FROM nginx:1.17.1-alpine
 # COPY nginx.conf /etc/nginx/nginx.conf
 COPY --from=build /usr/src/app/dist/support-portal-frontend /usr/share/nginx/html
 
-
-
-
-
 # Expose port 80 to the Docker host, so we can access it
 # from the outside.
 EXPOSE 80

support-portal-frontend/src/environments/environment.prod.ts

@@ -3,6 +3,6 @@ export const environment = {
   // apiUrl: 'http://support-portal.shyshkin.net:5000',
   // apiUrl: 'http://dockerapp.shyshkin.net:8080',
   // apiUrl: 'https://dockerapp.shyshkin.net',
-  apiUrl: 'https://cncbackend.techzoos.in',
+  apiUrl: 'https://cmcbackend.rootxwire.com',
   publicUrls: ['/user/login', '/user/register', '/user/*/profile-image', '/user/*/profile-image/**']
 };