mirrors/vaultwarden-web
1
0
Fork 0
mirror of https://github.com/dani-garcia/bw_web_builds.git synced 2025-01-12 04:37:19 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #169 from stefan0xC/update-to-v2024.6

Browse source 
update web-vault to v2024.6.2 and remove bitwarden_license/ from build
This commit is contained in:
Mathijs van Veluw 2024-08-07 21:04:10 +02:00 committed by GitHub
commit 7fe8618bac
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 1130 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Dockerfile
View file

@ -17,7 +17,7 @@
# Note: you can use --build-arg to specify the version to build:
# docker build -t web_vault_build --build-arg VAULT_VERSION=main .
FROM node:18-bookworm AS build
FROM node:20-bookworm AS build
RUN node --version && npm --version
# Prepare the folder to enable non-root, otherwise npm will refuse to run the postinstall
@ -28,8 +28,8 @@ USER node
# Can be a tag, release, but prefer a commit hash because it's not changeable
# https://github.com/bitwarden/clients/commit/${VAULT_VERSION}
#
# Using https://github.com/bitwarden/clients/releases/tag/web-v2024.5.1
ARG VAULT_VERSION=9823f69c9d17e2d94de1cc005e01202dd95f0647
# Using https://github.com/bitwarden/clients/releases/tag/web-v2024.6.2
ARG VAULT_VERSION=e2354e8694ab5e532d04f275e4bd6bf560c7509b
WORKDIR /vault
RUN git -c init.defaultBranch=main init && \

1123
patches/v2024.6.2.patch Normal file
View file

File diff suppressed because it is too large Load diff

3
scripts/apply_patches.sh
View file

@ -49,6 +49,9 @@ replace_embedded_svg_icon \
../resources/vaultwarden-password-manager-logo.svg \
./apps/web/src/app/layouts/password-manager-logo.ts
echo "Remove non-free bitwarden_license/ code"
rm -rf ./bitwarden_license/
echo "Using patch: ${PATCH_NAME}"
git apply "../patches/${PATCH_NAME}" --reject

1
scripts/generate_patch_file.sh
View file

@ -38,6 +38,7 @@ if [ "$(git status --porcelain | wc -l)" -ge 1 ]; then
':!apps/web/src/images/icons/safari-pinned-tab.svg' \
':!apps/web/src/app/admin-console/icons/admin-console-logo.ts' \
':!apps/web/src/app/layouts/password-manager-logo.ts' \
':!bitwarden_license/' \
> "../patches/${PATCH_FILENAME}"
echo "Patch has been created here: patches/${PATCH_FILENAME}"
else