Browse Source

BRE-1355 - Rename Bitwarden Unified to Bitwarden Lite (#425)

pull/426/head
Vince Grassia 4 weeks ago committed by GitHub
parent
commit
7e8f06fe7b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 4
      .github/CODEOWNERS
  2. 4
      .github/ISSUE_TEMPLATE/bug.yml
  3. 23
      .github/workflows/build-bitwarden-lite.yml
  4. 6
      .github/workflows/release.yml
  5. 0
      bitwarden-lite/.env.example
  6. 28
      bitwarden-lite/Dockerfile
  7. 0
      bitwarden-lite/docker-compose.yml
  8. 0
      bitwarden-lite/entrypoint.sh
  9. 0
      bitwarden-lite/hbs/app-id.hbs
  10. 0
      bitwarden-lite/hbs/config.yaml
  11. 0
      bitwarden-lite/hbs/nginx-config.hbs
  12. 0
      bitwarden-lite/nginx/logrotate.sh
  13. 0
      bitwarden-lite/nginx/mime.types
  14. 0
      bitwarden-lite/nginx/nginx.conf
  15. 0
      bitwarden-lite/nginx/proxy.conf
  16. 0
      bitwarden-lite/nginx/security-headers-ssl.conf
  17. 0
      bitwarden-lite/nginx/security-headers.conf
  18. 0
      bitwarden-lite/settings.env
  19. 0
      bitwarden-lite/supervisord/admin.ini
  20. 0
      bitwarden-lite/supervisord/api.ini
  21. 0
      bitwarden-lite/supervisord/events.ini
  22. 0
      bitwarden-lite/supervisord/icons.ini
  23. 0
      bitwarden-lite/supervisord/identity.ini
  24. 0
      bitwarden-lite/supervisord/nginx.ini
  25. 0
      bitwarden-lite/supervisord/notifications.ini
  26. 0
      bitwarden-lite/supervisord/scim.ini
  27. 0
      bitwarden-lite/supervisord/sso.ini
  28. 0
      bitwarden-lite/supervisord/supervisord.conf

4
.github/CODEOWNERS

@ -14,5 +14,5 @@ @@ -14,5 +14,5 @@
**/docker-compose.yml @bitwarden/team-appsec @bitwarden/dept-bre
# Shared Platform and BRE
.github/workflows/build-unified.yml @bitwarden/team-platform-dev @bitwarden/dept-bre
docker-unified/ @bitwarden/team-platform-dev @bitwarden/dept-bre
.github/workflows/build-bitwarden-lite.yml @bitwarden/team-platform-dev @bitwarden/dept-bre
bitwarden-lite/ @bitwarden/team-platform-dev @bitwarden/dept-bre

4
.github/ISSUE_TEMPLATE/bug.yml

@ -8,14 +8,14 @@ body: @@ -8,14 +8,14 @@ body:
Thanks for taking the time to fill out this bug report!
> [!WARNING]
> This repository only tracks installation scripts for our self-host project. For any other Bitwarden Server issues including Bitwarden Unified, please submit your report in [bitwarden/server](https://github.com/bitwarden/server)
> This repository only tracks installation scripts for our self-host project. For any other Bitwarden Server issues including Bitwarden Lite, please submit your report in [bitwarden/server](https://github.com/bitwarden/server)
Please do not submit feature requests. The [Community Forums](https://community.bitwarden.com) has a section for submitting, voting for, and discussing product feature requests.
- type: checkboxes
id: self-host-scripts
attributes:
label: Self-host installation scripts issue
description: "This repository only tracks installation scripts for our self-host project, any other Bitwarden Server issues including Bitwarden Unified should be reported in [bitwarden/server](https://github.com/bitwarden/server)"
description: "This repository only tracks installation scripts for our self-host project, any other Bitwarden Server issues including Bitwarden Lite should be reported in [bitwarden/server](https://github.com/bitwarden/server)"
options:
- label: "I understand this repository only tracks self-host installation scripts and any other issues should be reported in bitwarden/server"
required: true

23
.github/workflows/build-unified.yml → .github/workflows/build-bitwarden-lite.yml

@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
name: Build Self-Host Unified
name: Build Bitwarden Lite
on:
push:
paths:
- "docker-unified/**"
- ".github/workflows/build-unified.yml"
- "bitwarden-lite/**"
- ".github/workflows/build-bitwarden-lite.yml"
workflow_dispatch:
inputs:
server_branch:
description: "Server branch name to deploy (examples: 'main', 'rc', 'feature/sm')"
description: "Server branch name (examples: 'main', 'rc', 'feature/sm')"
type: string
default: main
web_branch:
description: "Web client branch name to deploy (examples: 'main', 'rc', 'feature/sm')"
description: "Web client branch name (examples: 'main', 'rc', 'feature/sm')"
type: string
default: main
use_latest_core_version:
@ -21,8 +21,8 @@ on: @@ -21,8 +21,8 @@ on:
default: false
pull_request:
paths:
- ".github/workflows/build-unified.yml"
- "docker-unified/**"
- ".github/workflows/build-bitwarden-lite.yml"
- "bitwarden-lite/**"
env:
_AZ_REGISTRY: bitwardenprod.azurecr.io
@ -48,8 +48,9 @@ jobs: @@ -48,8 +48,9 @@ jobs:
id: server-branch-name
env:
SERVER_BRANCH: ${{ inputs.server_branch }}
USE_LATEST_CORE_VERSION: ${{ inputs.use_latest_core_version }}
run: |
if [[ "${{ inputs.use_latest_core_version }}" == "true" ]]; then
if [[ "$USE_LATEST_CORE_VERSION" == "true" ]]; then
# Extract coreVersion from version.json
CORE_VERSION=$(jq -r '.versions.coreVersion' version.json)
echo "Server version from version.json: $CORE_VERSION"
@ -138,9 +139,9 @@ jobs: @@ -138,9 +139,9 @@ jobs:
IS_PUBLISH_BRANCH: ${{ env.is_publish_branch }}
run: |
if [[ ("${IMAGE_TAG}" == "dev" || "${IMAGE_TAG}" == "beta") && "${IS_PUBLISH_BRANCH}" == "true" ]]; then
echo "tags=$_AZ_REGISTRY/self-host:${IMAGE_TAG},ghcr.io/bitwarden/self-host:${IMAGE_TAG}" >> "$GITHUB_OUTPUT"
echo "tags=$_AZ_REGISTRY/lite:${IMAGE_TAG},ghcr.io/bitwarden/lite:${IMAGE_TAG}" >> "$GITHUB_OUTPUT"
else
echo "tags=$_AZ_REGISTRY/self-host:${IMAGE_TAG}" >> "$GITHUB_OUTPUT"
echo "tags=$_AZ_REGISTRY/lite:${IMAGE_TAG}" >> "$GITHUB_OUTPUT"
fi
- name: Get Azure Key Vault secrets
@ -191,7 +192,7 @@ jobs: @@ -191,7 +192,7 @@ jobs:
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
with:
context: .
file: docker-unified/Dockerfile
file: bitwarden-lite/Dockerfile
platforms: |
linux/amd64,
linux/arm/v7,

6
.github/workflows/release.yml

@ -308,8 +308,8 @@ jobs: @@ -308,8 +308,8 @@ jobs:
uses: bitwarden/gh-actions/azure-logout@main
release-unified:
name: Release Self-host unified
release-bitwarden-lite:
name: Release Bitwarden Lite
runs-on: ubuntu-24.04
needs:
- setup
@ -397,7 +397,7 @@ jobs: @@ -397,7 +397,7 @@ jobs:
- setup
- release
- tag-push-latest-images
- release-unified
- release-bitwarden-lite
permissions:
id-token: write
steps:

0
docker-unified/.env.example → bitwarden-lite/.env.example

28
docker-unified/Dockerfile → bitwarden-lite/Dockerfile

@ -185,7 +185,7 @@ RUN . /tmp/rid.txt && dotnet publish -c release -o /app/Scim --no-restore --no-s @@ -185,7 +185,7 @@ RUN . /tmp/rid.txt && dotnet publish -c release -o /app/Scim --no-restore --no-s
FROM mcr.microsoft.com/dotnet/aspnet:8.0-alpine3.21
ARG TARGETPLATFORM
LABEL com.bitwarden.product="bitwarden"
LABEL com.bitwarden.project="unified"
LABEL com.bitwarden.project="lite"
ENV ASPNETCORE_ENVIRONMENT=Production
ENV BW_ENABLE_ADMIN=true
ENV BW_ENABLE_API=true
@ -198,7 +198,7 @@ ENV BW_ENABLE_SSO=false @@ -198,7 +198,7 @@ ENV BW_ENABLE_SSO=false
ENV BW_DB_FILE="/etc/bitwarden/vault.db"
ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false
ENV globalSettings__selfHosted="true"
ENV globalSettings__unifiedDeployment="true"
ENV globalSettings__liteDeployment="true"
ENV globalSettings__pushRelayBaseUri="https://push.bitwarden.com"
ENV globalSettings__baseServiceUri__internalAdmin="http://localhost:5000"
ENV globalSettings__baseServiceUri__internalApi="http://localhost:5001"
@ -253,23 +253,23 @@ COPY --from=dotnet-build /app ./ @@ -253,23 +253,23 @@ COPY --from=dotnet-build /app ./
COPY --from=web-setup /tmp/build /app/Web
# Set up supervisord
COPY docker-unified/supervisord/*.ini /etc/supervisor.d/
COPY docker-unified/supervisord/supervisord.conf /etc/supervisor/supervisord.conf
COPY bitwarden-lite/supervisord/*.ini /etc/supervisor.d/
COPY bitwarden-lite/supervisord/supervisord.conf /etc/supervisor/supervisord.conf
RUN rm -f /etc/supervisord.conf
# Set up nginx
COPY docker-unified/nginx/nginx.conf /etc/nginx
COPY docker-unified/nginx/proxy.conf /etc/nginx
COPY docker-unified/nginx/mime.types /etc/nginx
COPY docker-unified/nginx/security-headers.conf /etc/nginx
COPY docker-unified/nginx/security-headers-ssl.conf /etc/nginx
COPY docker-unified/nginx/logrotate.sh /
COPY bitwarden-lite/nginx/nginx.conf /etc/nginx
COPY bitwarden-lite/nginx/proxy.conf /etc/nginx
COPY bitwarden-lite/nginx/mime.types /etc/nginx
COPY bitwarden-lite/nginx/security-headers.conf /etc/nginx
COPY bitwarden-lite/nginx/security-headers-ssl.conf /etc/nginx
COPY bitwarden-lite/nginx/logrotate.sh /
RUN chmod +x /logrotate.sh
# Copy configuration templates
COPY docker-unified/hbs/nginx-config.hbs /etc/hbs/
COPY docker-unified/hbs/app-id.hbs /etc/hbs/
COPY docker-unified/hbs/config.yaml /etc/hbs/
COPY bitwarden-lite/hbs/nginx-config.hbs /etc/hbs/
COPY bitwarden-lite/hbs/app-id.hbs /etc/hbs/
COPY bitwarden-lite/hbs/config.yaml /etc/hbs/
# Download hbs tool for generating final configurations
RUN echo "$(curl --silent https://api.github.com/repos/bitwarden/Handlebars.conf/git/refs/tags | jq -r 'last(.[].ref)' | sed 's/refs\/tags\///')" > /tmp/latest.txt
@ -282,7 +282,7 @@ RUN unzip hbs.zip -d /usr/local/bin && mv /usr/local/bin/hbs* /usr/local/bin/hbs @@ -282,7 +282,7 @@ RUN unzip hbs.zip -d /usr/local/bin && mv /usr/local/bin/hbs* /usr/local/bin/hbs
RUN chmod +x /usr/local/bin/hbs
# Copy entrypoint script and make it executable
COPY docker-unified/entrypoint.sh /entrypoint.sh
COPY bitwarden-lite/entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
VOLUME ["/etc/bitwarden"]

0
docker-unified/docker-compose.yml → bitwarden-lite/docker-compose.yml

0
docker-unified/entrypoint.sh → bitwarden-lite/entrypoint.sh

0
docker-unified/hbs/app-id.hbs → bitwarden-lite/hbs/app-id.hbs

0
docker-unified/hbs/config.yaml → bitwarden-lite/hbs/config.yaml

0
docker-unified/hbs/nginx-config.hbs → bitwarden-lite/hbs/nginx-config.hbs

0
docker-unified/nginx/logrotate.sh → bitwarden-lite/nginx/logrotate.sh

0
docker-unified/nginx/mime.types → bitwarden-lite/nginx/mime.types

0
docker-unified/nginx/nginx.conf → bitwarden-lite/nginx/nginx.conf

0
docker-unified/nginx/proxy.conf → bitwarden-lite/nginx/proxy.conf

0
docker-unified/nginx/security-headers-ssl.conf → bitwarden-lite/nginx/security-headers-ssl.conf

0
docker-unified/nginx/security-headers.conf → bitwarden-lite/nginx/security-headers.conf

0
docker-unified/settings.env → bitwarden-lite/settings.env

0
docker-unified/supervisord/admin.ini → bitwarden-lite/supervisord/admin.ini

0
docker-unified/supervisord/api.ini → bitwarden-lite/supervisord/api.ini

0
docker-unified/supervisord/events.ini → bitwarden-lite/supervisord/events.ini

0
docker-unified/supervisord/icons.ini → bitwarden-lite/supervisord/icons.ini

0
docker-unified/supervisord/identity.ini → bitwarden-lite/supervisord/identity.ini

0
docker-unified/supervisord/nginx.ini → bitwarden-lite/supervisord/nginx.ini

0
docker-unified/supervisord/notifications.ini → bitwarden-lite/supervisord/notifications.ini

0
docker-unified/supervisord/scim.ini → bitwarden-lite/supervisord/scim.ini

0
docker-unified/supervisord/sso.ini → bitwarden-lite/supervisord/sso.ini

0
docker-unified/supervisord/supervisord.conf → bitwarden-lite/supervisord/supervisord.conf

Loading…
Cancel
Save