Skip to content

Commit

Permalink
Merge pull request #127 from stefan0xC/support-annotated-tags
Browse files Browse the repository at this point in the history
Support annotated tags and update web-vault to web-v2023.4.2
  • Loading branch information
BlackDex authored May 11, 2023
2 parents f01c4b2 + 7f1ade9 commit 2b479da
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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-v2023.4.1
ARG VAULT_VERSION=4f4715fd0d7fc2e224a5efd5c6f8ce942922f067
# Using https://github.com/bitwarden/clients/releases/tag/web-v2023.4.2
ARG VAULT_VERSION=b416432bce79cf6ee99adb908a5a26b66bb7869b

WORKDIR /vault
RUN git init
Expand All @@ -53,7 +53,7 @@ WORKDIR /vault/apps/web
RUN npm run dist:oss:selfhost

RUN printf '{"version":"%s"}' \
$(git -c 'versionsort.suffix=-' ls-remote --tags --sort='v:refname' https://github.com/dani-garcia/bw_web_builds.git 'v*' | tail -n1 | grep -Eo '[^\/v]*$') \
$(git -c 'versionsort.suffix=-' ls-remote --tags --refs --sort='v:refname' https://github.com/dani-garcia/bw_web_builds.git 'v*' | tail -n1 | grep -Eo '[^\/v]*$') \
> build/vw-version.json

# Delete debugging map files, optional
Expand Down
2 changes: 1 addition & 1 deletion scripts/build_web_vault.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ npm run dist:oss:selfhost

# Create vw-version.json with the latest tag from the remote repo.
printf '{"version":"%s"}' \
"$(git -c 'versionsort.suffix=-' ls-remote --tags --sort='v:refname' https://github.com/dani-garcia/bw_web_builds.git 'v*' | tail -n1 | grep -Eo '[^\/v]*$')" \
"$(git -c 'versionsort.suffix=-' ls-remote --tags --refs --sort='v:refname' https://github.com/dani-garcia/bw_web_builds.git 'v*' | tail -n1 | grep -Eo '[^\/v]*$')" \
> build/vw-version.json

popd
Expand Down

0 comments on commit 2b479da

Please sign in to comment.