Merge pull request #131 from docker/fix/mui-license

Fix MUI license injection
docker · Apr 19, 2024 · e44e78a · e44e78a
2 parents df17187 + 7817871
commit e44e78a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/.github/workflows/build-scan-push.yaml b/.github/workflows/build-scan-push.yaml
@@ -125,8 +125,8 @@ jobs:
             BUGSNAG_RELEASE_STAGE=production
             BUGSNAG_APP_VERSION=${{ github.event.release.tag_name }}
           secrets: |
-            BUGSNAG_API_KEY=${{ secrets.BUGSNAG_API_KEY }}
-            REACT_APP_MUI_LICENSE_KEY=${{ secrets.REACT_APP_MUI_LICENSE_KEY }}
+            "BUGSNAG_API_KEY=${{ secrets.BUGSNAG_API_KEY }}"
+            "REACT_APP_MUI_LICENSE_KEY=${{ secrets.REACT_APP_MUI_LICENSE_KEY }}"
 
         # If PR, put image tags in the PR comments
         # from https://github.com/marketplace/actions/create-or-update-comment

diff --git a/Dockerfile b/Dockerfile
@@ -20,12 +20,11 @@ RUN --mount=type=cache,target=/usr/src/app/.npm \
     npm ci
 # install
 COPY ui /ui
-RUN --mount=type=secret,id=BUGSNAG_API_KEY \
+RUN --mount=type=secret,id=BUGSNAG_API_KEY,target=/run/secrets/BUGSNAG_API_KEY \
+    --mount=type=secret,id=REACT_APP_MUI_LICENSE_KEY,target=/run/secrets/REACT_APP_MUI_LICENSE_KEY \
     REACT_APP_BUGSNAG_API_KEY=$(cat /run/secrets/BUGSNAG_API_KEY) \
-    npm run build
-RUN --mount=type=secret,id=REACT_APP_MUI_LICENSE_KEY \
     REACT_APP_MUI_LICENSE_KEY=$(cat /run/secrets/REACT_APP_MUI_LICENSE_KEY) \
-    yarn build
+    npm run build
 
 FROM alpine:3.16@sha256:bc41182d7ef5ffc53a40b044e725193bc10142a1243f395ee852a8d9730fc2ad as base
 ARG CLI_VERSION=20.10.17