From e867b7d0f15d788f5a9f9c4e86e3c19ae8d3c218 Mon Sep 17 00:00:00 2001
From: Igor Gov <iggvrv@gmail.com>
Date: Tue, 29 Mar 2022 14:14:52 +0300
Subject: [PATCH] Build ui-common part of CI (#914)

* Build ui-common always locally
---
 .github/workflows/build.yml |  2 +-
 Dockerfile                  | 11 +++++++++++
 ui-common/package-lock.json |  4 ++--
 ui-common/package.json      |  2 +-
 ui/package.json             |  2 +-
 5 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3e2479ba7..bd9040de8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -45,7 +45,7 @@ jobs:
       
       - name: Check modified files
         id: modified_files
-        run: devops/check_modified_files.sh agent/ shared/ tap/ ui/ Dockerfile
+        run: devops/check_modified_files.sh agent/ shared/ tap/ ui/ ui-common/ Dockerfile
 
       - name: Set up Docker Buildx
         if: steps.modified_files.outputs.matched == 'true'
diff --git a/Dockerfile b/Dockerfile
index fefdfde3d..cbf82e25f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,12 +1,23 @@
 ARG BUILDARCH=amd64
 ARG TARGETARCH=amd64
 
+### Front-end common
+FROM node:16 AS front-end-common
+
+WORKDIR /app/ui-build
+COPY ui-common/package.json .
+COPY ui-common/package-lock.json .
+RUN npm i
+COPY ui-common .
+RUN npm pack
+
 ### Front-end
 FROM node:16 AS front-end
 
 WORKDIR /app/ui-build
 
 COPY ui/package.json ui/package-lock.json ./
+COPY --from=front-end-common ["/app/ui-build/up9-mizu-common-0.0.0.tgz", "."]
 RUN npm i
 COPY ui .
 RUN npm run build
diff --git a/ui-common/package-lock.json b/ui-common/package-lock.json
index 155ac73af..ce3b197b9 100644
--- a/ui-common/package-lock.json
+++ b/ui-common/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@up9/mizu-common",
-  "version": "1.0.135",
+  "version": "0.0.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@up9/mizu-common",
-      "version": "1.0.135",
+      "version": "0.0.0",
       "license": "MIT",
       "dependencies": {
         "@craco/craco": "^6.4.3",
diff --git a/ui-common/package.json b/ui-common/package.json
index 8c69f9a36..012d8a959 100644
--- a/ui-common/package.json
+++ b/ui-common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@up9/mizu-common",
-  "version": "1.0.145",
+  "version": "0.0.0",
   "description": "Made with create-react-library",
   "author": "",
   "license": "MIT",
diff --git a/ui/package.json b/ui/package.json
index 613def3f3..63846ff89 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -13,7 +13,7 @@
     "@types/jest": "^26.0.22",
     "@types/node": "^12.20.10",
     "@uiw/react-textarea-code-editor": "^1.4.12",
-    "@up9/mizu-common": "1.0.145",
+    "@up9/mizu-common": "file:up9-mizu-common-0.0.0.tgz",
     "axios": "^0.25.0",
     "core-js": "^3.20.2",
     "craco-babel-loader": "^1.0.3",