chore: Update build command for client apps

equinor · Sep 16, 2024 · 39eed8a · 39eed8a
1 parent 9c39ddf
commit 39eed8a
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 9 deletions.
diff --git a/.github/workflows/common-release.yml b/.github/workflows/common-release.yml
@@ -140,7 +140,7 @@ jobs:
       - name: Build
         run: |
           cd client
-          yarn build
+          yarn build:apps
 
       - name: Deploy
         run: |

diff --git a/.github/workflows/deploy-apps-test.yml b/.github/workflows/deploy-apps-test.yml
@@ -45,7 +45,7 @@ jobs:
       - name: Build
         run: |
           cd client
-          yarn build
+          yarn build:apps
 
       - name: Deploy
         run: |

diff --git a/client/apps/portal-administration/package.json b/client/apps/portal-administration/package.json
@@ -6,7 +6,7 @@
   "type": "module",
   "main": "src/index.ts",
   "scripts": {
-    "build": "fusion-framework-cli app build",
+    "build:apps": "fusion-framework-cli app build",
     "dev": "fusion-framework-cli app dev",
     "docker": "cd .. && sh docker-script.sh app-react",
     "bundle": "fusion-framework-cli app pack"

diff --git a/client/package.json b/client/package.json
@@ -6,6 +6,7 @@
     "dev": "npx lerna run dev",
     "start": "npx lerna run serve",
     "build": "npx lerna run build",
+    "build:apps": "npx lerna run build:apps",
     "test:all": "test:coverage && build:coverage",
     "test": "lerna  run test",
     "test:coverage": "lerna run test:coverage",

diff --git a/clientBackend.Dockerfile b/clientBackend.Dockerfile
@@ -11,12 +11,6 @@ COPY ["/client", "."]
 
 RUN yarn install --frozen-lockfile
 
-# run yarn install for the portal-administration app
-RUN cd apps/portal-administration
-RUN npm i -g @equinor/fusion-framework-cli
-RUN yarn install
-RUN cd ../..
-
 RUN npx yarn run build
 
 # 2: Build & run web server