mirror of
https://github.com/dani-garcia/bw_web_builds.git
synced 2024-10-22 10:35:41 +03:00
Merge branch 'master' into feature/build
This commit is contained in:
commit
b20d398f5a
5 changed files with 1136 additions and 7 deletions
8
.github/workflows/release.yml
vendored
8
.github/workflows/release.yml
vendored
|
@ -19,7 +19,7 @@ jobs:
|
||||||
HAVE_GHCR_LOGIN: ${{ vars.GHCR_REPO != '' && github.repository_owner != '' && secrets.GITHUB_TOKEN != '' }}
|
HAVE_GHCR_LOGIN: ${{ vars.GHCR_REPO != '' && github.repository_owner != '' && secrets.GITHUB_TOKEN != '' }}
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
|
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
|
||||||
|
|
||||||
# Determine Docker Tag
|
# Determine Docker Tag
|
||||||
- name: Init Variables
|
- name: Init Variables
|
||||||
|
@ -34,7 +34,7 @@ jobs:
|
||||||
|
|
||||||
# Login to Docker Hub
|
# Login to Docker Hub
|
||||||
- name: Login to Docker Hub
|
- name: Login to Docker Hub
|
||||||
uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
|
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
|
||||||
with:
|
with:
|
||||||
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||||
|
@ -49,7 +49,7 @@ jobs:
|
||||||
|
|
||||||
# Login to GitHub Container Registry
|
# Login to GitHub Container Registry
|
||||||
- name: Login to GitHub Container Registry
|
- name: Login to GitHub Container Registry
|
||||||
uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
|
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
|
||||||
with:
|
with:
|
||||||
registry: ghcr.io
|
registry: ghcr.io
|
||||||
username: ${{ github.repository_owner }}
|
username: ${{ github.repository_owner }}
|
||||||
|
@ -64,7 +64,7 @@ jobs:
|
||||||
| tee -a "${GITHUB_ENV}"
|
| tee -a "${GITHUB_ENV}"
|
||||||
|
|
||||||
- name: Build and push
|
- name: Build and push
|
||||||
uses: docker/build-push-action@4a13e500e55cf31b7a5d59a38ab2040ab0f42f56 # v5.1.0
|
uses: docker/build-push-action@5176d81f87c23d6fc96624dfdbcd9f3830bbe445 # v6.5.0
|
||||||
with:
|
with:
|
||||||
context: .
|
context: .
|
||||||
push: true
|
push: true
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
# syntax=docker/dockerfile:1
|
||||||
|
|
||||||
# Compile the web vault using docker
|
# Compile the web vault using docker
|
||||||
# Usage:
|
# Usage:
|
||||||
# Quick and easy:
|
# Quick and easy:
|
||||||
|
@ -15,14 +17,14 @@
|
||||||
# Note: you can use --build-arg to specify the version to build:
|
# Note: you can use --build-arg to specify the version to build:
|
||||||
# docker build -t web_vault_build --build-arg VAULT_VERSION=main .
|
# 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
|
RUN node --version && npm --version
|
||||||
|
|
||||||
# Can be a tag, release, but prefer a commit hash because it's not changeable
|
# Can be a tag, release, but prefer a commit hash because it's not changeable
|
||||||
# https://github.com/bitwarden/clients/commit/${VAULT_VERSION}
|
# https://github.com/bitwarden/clients/commit/${VAULT_VERSION}
|
||||||
#
|
#
|
||||||
# Using https://github.com/bitwarden/clients/releases/tag/web-v2024.5.1
|
# Using https://github.com/bitwarden/clients/releases/tag/web-v2024.6.2
|
||||||
ARG VAULT_VERSION=9823f69c9d17e2d94de1cc005e01202dd95f0647
|
ARG VAULT_VERSION=e2354e8694ab5e532d04f275e4bd6bf560c7509b
|
||||||
ENV VAULT_VERSION=$VAULT_VERSION
|
ENV VAULT_VERSION=$VAULT_VERSION
|
||||||
ENV VAULT_FOLDER=bw_clients
|
ENV VAULT_FOLDER=bw_clients
|
||||||
ENV CHECKOUT_TAGS=false
|
ENV CHECKOUT_TAGS=false
|
||||||
|
|
1123
patches/v2024.6.2.patch
Normal file
1123
patches/v2024.6.2.patch
Normal file
File diff suppressed because it is too large
Load diff
|
@ -49,6 +49,9 @@ replace_embedded_svg_icon \
|
||||||
../resources/vaultwarden-password-manager-logo.svg \
|
../resources/vaultwarden-password-manager-logo.svg \
|
||||||
./apps/web/src/app/layouts/password-manager-logo.ts
|
./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}"
|
echo "Using patch: ${PATCH_NAME}"
|
||||||
git apply "../patches/${PATCH_NAME}" --reject
|
git apply "../patches/${PATCH_NAME}" --reject
|
||||||
|
|
||||||
|
|
|
@ -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/images/icons/safari-pinned-tab.svg' \
|
||||||
':!apps/web/src/app/admin-console/icons/admin-console-logo.ts' \
|
':!apps/web/src/app/admin-console/icons/admin-console-logo.ts' \
|
||||||
':!apps/web/src/app/layouts/password-manager-logo.ts' \
|
':!apps/web/src/app/layouts/password-manager-logo.ts' \
|
||||||
|
':!bitwarden_license/' \
|
||||||
> "../patches/${PATCH_FILENAME}"
|
> "../patches/${PATCH_FILENAME}"
|
||||||
echo "Patch has been created here: patches/${PATCH_FILENAME}"
|
echo "Patch has been created here: patches/${PATCH_FILENAME}"
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in a new issue