Merge branch 'dev' into staging

deNBI · Aug 14, 2024 · 2002467 · 2002467
2 parents 65d99df + 4371607
commit 2002467
Show file tree

Hide file tree

Showing 5 changed files with 202 additions and 59 deletions.
diff --git a/.github/workflows/LintingAutoFix.yml b/.github/workflows/LintingAutoFix.yml
@@ -32,7 +32,7 @@ jobs:
         run: echo "The selected tag is ${{ steps.tag.outputs.TAG }}"
       - uses: actions/setup-node@v4
         with:
-          node-version: '18.18.2'
+          node-version: '18.20.3'
       - run: git status
       - run: npm install -g yarn
       - name: Prepare

diff --git a/.github/workflows/master-protection.yml b/.github/workflows/master-protection.yml
@@ -14,7 +14,7 @@ jobs:
         uses: rokroskar/[email protected]
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - uses: actions/[email protected].6
+      - uses: actions/[email protected].7
 
       - name: Check Tag
         run: |

diff --git a/Dockerfile b/Dockerfile
@@ -40,4 +40,4 @@ RUN mkdir -p /usr/share/nginx/html/portal/webapp
 COPY --from=builder /ng-app/dist /usr/share/nginx/html/portal/webapp
 
 # Start nginx server
-CMD ["/bin/sh", "-c", "envsubst < /usr/share/nginx/html/portal/webapp/static/webapp/assets/environment/env.template.js> /usr/share/nginx/html/portal/webapp/static/webapp/assets/environment/env.js && exec nginx -g 'daemon off;'"]
+CMD ["/bin/sh", "-c", "envsubst < /usr/share/nginx/html/portal/webapp/browser/static/webapp/assets/environment/env.template.js> /usr/share/nginx/html/portal/webapp/browser/static/webapp/assets/environment/env.js && exec nginx -g 'daemon off;'"]