From 8c4790d9f7b98ec78ef8652df380d6a8d10adb12 Mon Sep 17 00:00:00 2001 From: Vince Grassia <593223+vgrassia@users.noreply.github.com> Date: Tue, 18 Nov 2025 10:18:40 -0500 Subject: [PATCH] Rename Unified to Lite --- .github/CODEOWNERS | 4 +-- .github/ISSUE_TEMPLATE/bug.yml | 4 +-- ...d-unified.yml => build-bitwarden-lite.yml} | 12 ++++---- .github/workflows/release.yml | 6 ++-- .../.env.example | 0 {docker-unified => bitwarden-lite}/Dockerfile | 28 +++++++++---------- .../docker-compose.yml | 0 .../entrypoint.sh | 0 .../hbs/app-id.hbs | 0 .../hbs/config.yaml | 0 .../hbs/nginx-config.hbs | 0 .../nginx/logrotate.sh | 0 .../nginx/mime.types | 0 .../nginx/nginx.conf | 0 .../nginx/proxy.conf | 0 .../nginx/security-headers-ssl.conf | 0 .../nginx/security-headers.conf | 0 .../settings.env | 0 .../supervisord/admin.ini | 0 .../supervisord/api.ini | 0 .../supervisord/events.ini | 0 .../supervisord/icons.ini | 0 .../supervisord/identity.ini | 0 .../supervisord/nginx.ini | 0 .../supervisord/notifications.ini | 0 .../supervisord/scim.ini | 0 .../supervisord/sso.ini | 0 .../supervisord/supervisord.conf | 0 28 files changed, 27 insertions(+), 27 deletions(-) rename .github/workflows/{build-unified.yml => build-bitwarden-lite.yml} (97%) rename {docker-unified => bitwarden-lite}/.env.example (100%) rename {docker-unified => bitwarden-lite}/Dockerfile (93%) rename {docker-unified => bitwarden-lite}/docker-compose.yml (100%) rename {docker-unified => bitwarden-lite}/entrypoint.sh (100%) rename {docker-unified => bitwarden-lite}/hbs/app-id.hbs (100%) rename {docker-unified => bitwarden-lite}/hbs/config.yaml (100%) rename {docker-unified => bitwarden-lite}/hbs/nginx-config.hbs (100%) rename {docker-unified => bitwarden-lite}/nginx/logrotate.sh (100%) rename {docker-unified => bitwarden-lite}/nginx/mime.types (100%) rename {docker-unified => bitwarden-lite}/nginx/nginx.conf (100%) rename {docker-unified => bitwarden-lite}/nginx/proxy.conf (100%) rename {docker-unified => bitwarden-lite}/nginx/security-headers-ssl.conf (100%) rename {docker-unified => bitwarden-lite}/nginx/security-headers.conf (100%) rename {docker-unified => bitwarden-lite}/settings.env (100%) rename {docker-unified => bitwarden-lite}/supervisord/admin.ini (100%) rename {docker-unified => bitwarden-lite}/supervisord/api.ini (100%) rename {docker-unified => bitwarden-lite}/supervisord/events.ini (100%) rename {docker-unified => bitwarden-lite}/supervisord/icons.ini (100%) rename {docker-unified => bitwarden-lite}/supervisord/identity.ini (100%) rename {docker-unified => bitwarden-lite}/supervisord/nginx.ini (100%) rename {docker-unified => bitwarden-lite}/supervisord/notifications.ini (100%) rename {docker-unified => bitwarden-lite}/supervisord/scim.ini (100%) rename {docker-unified => bitwarden-lite}/supervisord/sso.ini (100%) rename {docker-unified => bitwarden-lite}/supervisord/supervisord.conf (100%) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 34fdbf9..9009413 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -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 diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml index 94332c8..141349a 100644 --- a/.github/ISSUE_TEMPLATE/bug.yml +++ b/.github/ISSUE_TEMPLATE/bug.yml @@ -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 diff --git a/.github/workflows/build-unified.yml b/.github/workflows/build-bitwarden-lite.yml similarity index 97% rename from .github/workflows/build-unified.yml rename to .github/workflows/build-bitwarden-lite.yml index a69980e..fee26f4 100644 --- a/.github/workflows/build-unified.yml +++ b/.github/workflows/build-bitwarden-lite.yml @@ -1,10 +1,10 @@ -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: @@ -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 @@ -191,7 +191,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, diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5595571..1ff5253 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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: - setup - release - tag-push-latest-images - - release-unified + - release-bitwarden-lite permissions: id-token: write steps: diff --git a/docker-unified/.env.example b/bitwarden-lite/.env.example similarity index 100% rename from docker-unified/.env.example rename to bitwarden-lite/.env.example diff --git a/docker-unified/Dockerfile b/bitwarden-lite/Dockerfile similarity index 93% rename from docker-unified/Dockerfile rename to bitwarden-lite/Dockerfile index 05680af..c0b5008 100644 --- a/docker-unified/Dockerfile +++ b/bitwarden-lite/Dockerfile @@ -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 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 ./ 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 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"] diff --git a/docker-unified/docker-compose.yml b/bitwarden-lite/docker-compose.yml similarity index 100% rename from docker-unified/docker-compose.yml rename to bitwarden-lite/docker-compose.yml diff --git a/docker-unified/entrypoint.sh b/bitwarden-lite/entrypoint.sh similarity index 100% rename from docker-unified/entrypoint.sh rename to bitwarden-lite/entrypoint.sh diff --git a/docker-unified/hbs/app-id.hbs b/bitwarden-lite/hbs/app-id.hbs similarity index 100% rename from docker-unified/hbs/app-id.hbs rename to bitwarden-lite/hbs/app-id.hbs diff --git a/docker-unified/hbs/config.yaml b/bitwarden-lite/hbs/config.yaml similarity index 100% rename from docker-unified/hbs/config.yaml rename to bitwarden-lite/hbs/config.yaml diff --git a/docker-unified/hbs/nginx-config.hbs b/bitwarden-lite/hbs/nginx-config.hbs similarity index 100% rename from docker-unified/hbs/nginx-config.hbs rename to bitwarden-lite/hbs/nginx-config.hbs diff --git a/docker-unified/nginx/logrotate.sh b/bitwarden-lite/nginx/logrotate.sh similarity index 100% rename from docker-unified/nginx/logrotate.sh rename to bitwarden-lite/nginx/logrotate.sh diff --git a/docker-unified/nginx/mime.types b/bitwarden-lite/nginx/mime.types similarity index 100% rename from docker-unified/nginx/mime.types rename to bitwarden-lite/nginx/mime.types diff --git a/docker-unified/nginx/nginx.conf b/bitwarden-lite/nginx/nginx.conf similarity index 100% rename from docker-unified/nginx/nginx.conf rename to bitwarden-lite/nginx/nginx.conf diff --git a/docker-unified/nginx/proxy.conf b/bitwarden-lite/nginx/proxy.conf similarity index 100% rename from docker-unified/nginx/proxy.conf rename to bitwarden-lite/nginx/proxy.conf diff --git a/docker-unified/nginx/security-headers-ssl.conf b/bitwarden-lite/nginx/security-headers-ssl.conf similarity index 100% rename from docker-unified/nginx/security-headers-ssl.conf rename to bitwarden-lite/nginx/security-headers-ssl.conf diff --git a/docker-unified/nginx/security-headers.conf b/bitwarden-lite/nginx/security-headers.conf similarity index 100% rename from docker-unified/nginx/security-headers.conf rename to bitwarden-lite/nginx/security-headers.conf diff --git a/docker-unified/settings.env b/bitwarden-lite/settings.env similarity index 100% rename from docker-unified/settings.env rename to bitwarden-lite/settings.env diff --git a/docker-unified/supervisord/admin.ini b/bitwarden-lite/supervisord/admin.ini similarity index 100% rename from docker-unified/supervisord/admin.ini rename to bitwarden-lite/supervisord/admin.ini diff --git a/docker-unified/supervisord/api.ini b/bitwarden-lite/supervisord/api.ini similarity index 100% rename from docker-unified/supervisord/api.ini rename to bitwarden-lite/supervisord/api.ini diff --git a/docker-unified/supervisord/events.ini b/bitwarden-lite/supervisord/events.ini similarity index 100% rename from docker-unified/supervisord/events.ini rename to bitwarden-lite/supervisord/events.ini diff --git a/docker-unified/supervisord/icons.ini b/bitwarden-lite/supervisord/icons.ini similarity index 100% rename from docker-unified/supervisord/icons.ini rename to bitwarden-lite/supervisord/icons.ini diff --git a/docker-unified/supervisord/identity.ini b/bitwarden-lite/supervisord/identity.ini similarity index 100% rename from docker-unified/supervisord/identity.ini rename to bitwarden-lite/supervisord/identity.ini diff --git a/docker-unified/supervisord/nginx.ini b/bitwarden-lite/supervisord/nginx.ini similarity index 100% rename from docker-unified/supervisord/nginx.ini rename to bitwarden-lite/supervisord/nginx.ini diff --git a/docker-unified/supervisord/notifications.ini b/bitwarden-lite/supervisord/notifications.ini similarity index 100% rename from docker-unified/supervisord/notifications.ini rename to bitwarden-lite/supervisord/notifications.ini diff --git a/docker-unified/supervisord/scim.ini b/bitwarden-lite/supervisord/scim.ini similarity index 100% rename from docker-unified/supervisord/scim.ini rename to bitwarden-lite/supervisord/scim.ini diff --git a/docker-unified/supervisord/sso.ini b/bitwarden-lite/supervisord/sso.ini similarity index 100% rename from docker-unified/supervisord/sso.ini rename to bitwarden-lite/supervisord/sso.ini diff --git a/docker-unified/supervisord/supervisord.conf b/bitwarden-lite/supervisord/supervisord.conf similarity index 100% rename from docker-unified/supervisord/supervisord.conf rename to bitwarden-lite/supervisord/supervisord.conf