Simon/self-host
1
0
Fork 0
mirror of https://github.com/bitwarden/self-host.git synced 2026-04-18 11:29:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add build arg for web container registry, dynamically set it based on branch built (#490)

Browse Source 
Used web-dev container for dev,rc
This commit is contained in:
MtnBurrit0
2026-04-08 15:02:26 -06:00
committed by GitHub
parent a7aadf07b8
commit 4912d12ed8
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.github/workflows/build-bitwarden-lite.yml vendored
View File

@@ -174,6 +174,7 @@ jobs:
run: |
if [[ $WEB_REF =~ ^refs/tags/web-v(.+)$ ]]; then
WEB_TAG="${BASH_REMATCH[1]}"
WEB_IMAGE="ghcr.io/bitwarden/web"
else
WEB_TAG=$(echo "${WEB_REF#refs/heads/}" | \
tr '[:upper:]' '[:lower:]' | \
@@ -181,17 +182,20 @@ jobs:
cut -c1-128 | \
sed -E 's/[.-]$//')
[[ "$WEB_TAG" == "main" ]] && WEB_TAG=dev
WEB_IMAGE="ghcr.io/bitwarden/web-dev"
fi
echo "web_tag=${WEB_TAG}" >> "$GITHUB_OUTPUT"
echo "web_image=${WEB_IMAGE}" >> "$GITHUB_OUTPUT"
- name: Log build configuration
env:
SERVER_TAG: ${{ steps.tag.outputs.image_tag }}
WEB_IMAGE: ${{ steps.web-tag.outputs.web_image }}
WEB_TAG: ${{ steps.web-tag.outputs.web_tag }}
run: |
echo "### Build Configuration" >> $GITHUB_STEP_SUMMARY
echo "- Server: ghcr.io/bitwarden/\*:${SERVER_TAG}" >> $GITHUB_STEP_SUMMARY
echo "- Web: ghcr.io/bitwarden/web:${WEB_TAG}" >> $GITHUB_STEP_SUMMARY
echo "- Web: ${WEB_IMAGE}:${WEB_TAG}" >> $GITHUB_STEP_SUMMARY
- name: Build and push Docker image
id: build-docker
@@ -207,6 +211,7 @@ jobs:
tags: ghcr.io/bitwarden/lite:${{ steps.tag.outputs.image_tag }}
build-args: |
SERVER_TAG=${{ steps.tag.outputs.image_tag }}
WEB_IMAGE=${{ steps.web-tag.outputs.web_image }}
WEB_TAG=${{ steps.web-tag.outputs.web_tag }}
cache-from: type=gha
cache-to: type=gha,mode=min

3
bitwarden-lite/Dockerfile
View File

@@ -1,11 +1,12 @@
# syntax = docker/dockerfile:1.21
ARG SERVER_TAG=dev
ARG WEB_IMAGE=ghcr.io/bitwarden/web
ARG WEB_TAG=dev
###############################################
# Web app stage #
###############################################
FROM ghcr.io/bitwarden/web:${WEB_TAG} AS web-app
FROM ${WEB_IMAGE}:${WEB_TAG} AS web-app
###############################################
# Server app stages #