Skip to content

Commit

Permalink
Merge pull request #186 from BlackDex/update-to-v2024.11
Browse files Browse the repository at this point in the history
Update to v2024.12 and Dynamic CSS
  • Loading branch information
BlackDex authored Dec 28, 2024
2 parents 847a1c5 + f892280 commit 1699ce9
Show file tree
Hide file tree
Showing 27 changed files with 2,585 additions and 14 deletions.
11 changes: 9 additions & 2 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,18 @@ web-vault
*.md
*.txt

# Other
# IDE files
.vscode
.idea
*.iml

# Environment files
.env
.build_env

# Other
.github
Makefile
.vscode

# Release files
*.tar.gz
Expand Down
3 changes: 3 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/.github @dani-garcia @BlackDex
/.github/CODEOWNERS @dani-garcia @BlackDex
/.github/workflows/** @dani-garcia @BlackDex
37 changes: 37 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: CI

on:
pull_request:
paths:
- ".github/workflows/ci.yml"
- "patches/v20*.patch"
- "resources/**"
- "scripts/**"
- "Dockerfile"

jobs:
docker-build:
runs-on: ubuntu-latest
env:
# Force docker to output the progress in plain
BUILDKIT_PROGRESS: plain
steps:
- name: Checkout
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

- name: Build and Extract
shell: bash
run: |
make docker-extract
- name: Generate checksum
shell: bash
run: |
echo "sha256sum: $(sha256sum container_builds/bw_web_vault.tar.gz)"
- name: "Upload web-vault artifact"
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
with:
name: web-vault
compression-level: 0
path: container_builds/bw_web_vault.tar.gz
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
HAVE_GHCR_LOGIN: ${{ vars.GHCR_REPO != '' && github.repository_owner != '' && secrets.GITHUB_TOKEN != '' }}
steps:
- name: Checkout
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

# Determine Docker Tag
- name: Init Variables
Expand Down Expand Up @@ -64,7 +64,7 @@ jobs:
| tee -a "${GITHUB_ENV}"
- name: Build and push
uses: docker/build-push-action@5176d81f87c23d6fc96624dfdbcd9f3830bbe445 # v6.5.0
uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75 # v6.9.0
with:
context: .
push: true
Expand Down
16 changes: 10 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
# Local build artifacts
builds/
docker_builds/
container_builds/
web-vault/
builds
docker_builds
container_builds
web-vault

# Other
# IDE files
.vscode
.idea
*.iml

# Environment files
.env
.build_env
.vscode

# Release files
*.tar.gz
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ RUN node --version && npm --version
# 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.6.2
ARG VAULT_VERSION=e2354e8694ab5e532d04f275e4bd6bf560c7509b
# Using https://github.com/bitwarden/clients/releases/tag/web-v2024.12.0
ARG VAULT_VERSION=e0c8f2ced997fc279c8ded903471ca3fa0fe5e94
ENV VAULT_VERSION=$VAULT_VERSION
ENV VAULT_FOLDER=bw_clients
ENV CHECKOUT_TAGS=false
Expand All @@ -45,7 +45,7 @@ RUN mv "${VAULT_FOLDER}/apps/web/build" ./web-vault

RUN tar -czvf "bw_web_vault.tar.gz" web-vault --owner=0 --group=0
# Output the sha256sum here so people are able to match the sha256sum from the CI with the assets and the downloaded version if needed
RUN echo "sha256sum: $(sha256sum "bw_web_vault.tar.gz")"
RUN echo "sha256sum: $(sha256sum bw_web_vault.tar.gz)"

# We copy the final result as a separate empty image so there's no need to download all the intermediate steps
# The result is included both uncompressed and as a tar.gz, to be able to use it in the docker images and the github releases directly
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit 1699ce9

Please sign in to comment.