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

Fix MUI license issue #132

Merged
merged 1 commit into from
Apr 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .github/workflows/build-scan-push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ jobs:
build-args: |
BUGSNAG_RELEASE_STAGE=production
BUGSNAG_APP_VERSION=${{ github.event.release.tag_name }}
VALID_SECRET_CACHE=1
secrets: |
"BUGSNAG_API_KEY=${{ secrets.BUGSNAG_API_KEY }}"
"REACT_APP_MUI_LICENSE_KEY=${{ secrets.REACT_APP_MUI_LICENSE_KEY }}"
Expand Down
5 changes: 4 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ RUN --mount=type=cache,target=/usr/src/app/.npm \
npm ci
# install
COPY ui /ui
# avoid reusing cached layers from another build without secrets provided, cf https://docs.docker.com/build/cache/invalidation/#build-secrets
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TIL!

ARG VALID_SECRET_CACHE
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) \
Expand Down Expand Up @@ -92,7 +94,7 @@ LABEL org.opencontainers.image.title="Volumes Backup & Share" \
]" \
com.docker.desktop.extension.icon="https://raw.githubusercontent.com/docker/volumes-backup-extension/main/icon.svg" \
com.docker.extension.changelog="<ul>\
<li>Fixed current image vulnerabilities (CVEs) using Docker Scout.</li> \
<li>Fix MUI missing license.</li> \
</ul>" \
com.docker.extension.categories="volumes"

Expand All @@ -108,6 +110,7 @@ COPY --from=docker-credentials-client-builder output/dist ./host

RUN mkdir -p /vackup

ARG VALID_SECRET_CACHE
RUN --mount=type=secret,id=BUGSNAG_API_KEY \
BUGSNAG_API_KEY=$(cat /run/secrets/BUGSNAG_API_KEY); \
echo "$BUGSNAG_API_KEY" > /tmp/bugsnag-api-key.txt
Expand Down
Loading