Fix compilation error

This commit is contained in:
Daniel García 2021-10-18 21:52:04 +02:00
parent 603fc946da
commit 3e77fc289b
No known key found for this signature in database
GPG key ID: FC8A7D14C3CD543A
2 changed files with 7 additions and 5 deletions

View file

@ -26,7 +26,7 @@ USER node
# https://github.com/bitwarden/web/commit/$VAULT_VERSION # https://github.com/bitwarden/web/commit/$VAULT_VERSION
# #
# Using https://github.com/bitwarden/web/releases/tag/v2.23.0 # Using https://github.com/bitwarden/web/releases/tag/v2.23.0
ARG VAULT_VERSION=cfa3d81cf87ed59c471021608b9b922023c825f1 ARG VAULT_VERSION=cfa3d81cf87ed59c471021608b9b922023c825f1 # TODO: When updating to a newer image, remove the package.json patch below
RUN git clone https://github.com/bitwarden/web.git /vault RUN git clone https://github.com/bitwarden/web.git /vault
WORKDIR /vault WORKDIR /vault
@ -40,8 +40,9 @@ COPY --chown=node:node apply_patches.sh /apply_patches.sh
RUN bash /apply_patches.sh RUN bash /apply_patches.sh
# Build # Build
RUN npm ci RUN sed -i 's/"gulp-google-webfonts": "^4.0.0"/"gulp-google-webfonts": "^4.1.0"/' package.json
RUN npm audit fix || true RUN npm ci --legacy-peer-deps
RUN npm audit fix --legacy-peer-deps || true
RUN npm run dist RUN npm run dist
RUN printf '{"version":"%s"}' \ RUN printf '{"version":"%s"}' \

View file

@ -47,8 +47,9 @@ git submodule update --recursive --init
. ../apply_patches.sh . ../apply_patches.sh
# Build # Build
npm ci sed -i 's/"gulp-google-webfonts": "^4.0.0"/"gulp-google-webfonts": "^4.1.0"/' package.json
npm audit fix || true npm ci --legacy-peer-deps
npm audit fix --legacy-peer-deps || true
npm run dist npm run dist
# Delete debugging map files, optional # Delete debugging map files, optional