Merge pull request #932 from gisaia/feat/enhance_build

Enhance build process
gisaia · Jan 23, 2025 · 651812e · 651812e
2 parents 7d0b950 + 0829b4e
commit 651812e
Show file tree

Hide file tree

Showing 12 changed files with 2,432 additions and 2,098 deletions.
diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml
@@ -16,13 +16,13 @@ jobs:
       - name: Build -opensource and cloud- Docker images
         run: |
           docker build -f docker/Dockerfile-production-cloud -t docker.io/gisaia/arlas-wui-cloud:${{ github.sha }} .
-          docker build -f docker/Dockerfile-production-opensource -t docker.io/gisaia/arlas-wui-opensource:${{ github.sha }} .
+          docker build -f docker/Dockerfile-production-opensource -t docker.io/gisaia/arlas-wui:${{ github.sha }} .
       - name: Run Trivy vulnerability scanner on opensource image
         uses: aquasecurity/trivy-action@master
         env:
           TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db:2
         with:
-          image-ref: "docker.io/gisaia/arlas-wui-opensource:${{ github.sha }}"
+          image-ref: "docker.io/gisaia/arlas-wui:${{ github.sha }}"
           format: "table"
           exit-code: "1"
           ignore-unfixed: true

diff --git a/angular.json b/angular.json
@@ -49,9 +49,6 @@
               "src/styles.scss",
               "node_modules/iv-viewer/dist/iv-viewer.css",
               "node_modules/@mapbox/mapbox-gl-draw/dist/mapbox-gl-draw.css"
-            ],
-            "scripts": [
-              "node_modules/mapbox-gl/dist/mapbox-gl.js"
             ]
           },
           "configurations": {
@@ -79,6 +76,9 @@
               "sourceMap": true,
               "browser": "src/main-cloud.ts",
               "tsConfig": "src/tsconfig.app.cloud.json",
+              "scripts": [
+                "node_modules/mapbox-gl/dist/mapbox-gl.js"
+              ],
               "styles": [
                 "src/styles/variables.scss",
                 "src/styles/arlas-wui-theme.scss",
@@ -89,7 +89,6 @@
               ],
               "namedChunks": true,
               "extractLicenses": false,
-
               "budgets": []
             },
             "production": {
@@ -177,6 +176,9 @@
               "styles": [
                 "node_modules/mapbox-gl/dist/mapbox-gl.css"
               ],
+              "scripts": [
+                "node_modules/mapbox-gl/dist/mapbox-gl.js"
+              ],
               "index": {
                 "input": "src/index.html",
                 "output": "index.html"
@@ -320,7 +322,6 @@
         "build": {
           "builder": "@angular-devkit/build-angular:ng-packagr",
           "defaultConfiguration": "production-cloud",
-
           "configurations": {
             "production-cloud": {
               "tsConfig": "tsconfig.lib.prod.cloud.json",
@@ -371,4 +372,4 @@
       "setParserOptionsProject": true
     }
   }
-}
+}
diff --git a/docker/Dockerfile-production-cloud b/docker/Dockerfile-production-cloud
@@ -3,8 +3,7 @@
 # We label our stage as 'builder'
 FROM node:18.20.5 AS builder
 
-COPY ./package.json  ./
-COPY ./package-lock.json  ./
+COPY ./packages/cloud/package-docker.json  ./package.json
 
 RUN npm set progress=false && npm config set depth 0 && npm cache clean --force
 

diff --git a/docker/Dockerfile-production-opensource b/docker/Dockerfile-production-opensource
@@ -3,8 +3,7 @@
 # We label our stage as 'builder'
 FROM node:18.20.5 AS builder
 
-COPY ./package.json  ./
-COPY ./package-lock.json  ./
+COPY ./packages/opensource/package-docker.json  ./package.json
 
 RUN npm set progress=false && npm config set depth 0 && npm cache clean --force