Skip to content
This repository has been archived by the owner on Oct 29, 2024. It is now read-only.

Fix MUI license injection #131

Merged
merged 6 commits into from
Apr 19, 2024
Merged

Fix MUI license injection #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a12c611
Use quotes for each line of secret as shown in the action docs
benja-M-1 Apr 18, 2024
4f76135
One run to mount two secrets and then run build
benja-M-1 Apr 18, 2024
3142b55
Downgarde docker/build-push-action
benja-M-1 Apr 18, 2024
351a8b0
Upgrade docker/build-push-action to v4
benja-M-1 Apr 18, 2024
8ffbe18
Upgrade docker/build-push-action to v5
benja-M-1 Apr 18, 2024
7817871
Re-add sbom and provenance
benja-M-1 Apr 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build-scan-push.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 3 additions & 4 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading