diff --git a/.chglog/config.yml b/.chglog/config.yml index 7c16e9f..d1c6c5d 100755 --- a/.chglog/config.yml +++ b/.chglog/config.yml @@ -2,7 +2,7 @@ style: github template: CHANGELOG.tpl.md info: title: CHANGELOG - repository_url: https://gitea.rknet.org/docker/bitwardenrs + repository_url: https://gitea.rknet.org/docker/vaultwarden options: commit_groups: title_maps: diff --git a/.drone.yml b/.drone.yml index 0420b32..d7cabac 100644 --- a/.drone.yml +++ b/.drone.yml @@ -28,7 +28,7 @@ platform: steps: - name: binary - image: clux/muslrust:nightly-2020-10-02 + image: clux/muslrust:nightly-2021-04-14 commands: - apt-get -qq update && apt-get install -yqq --no-install-recommends libpq-dev - make build @@ -38,8 +38,8 @@ steps: - name: verify image: alpine commands: - - src/target/x86_64-unknown-linux-musl/release/bitwarden_rs --help - - src/target/x86_64-unknown-linux-musl/release/bitwarden_rs --version + - src/target/x86_64-unknown-linux-musl/release/vaultwarden --help + - src/target/x86_64-unknown-linux-musl/release/vaultwarden --version depends_on: - binary @@ -165,7 +165,7 @@ steps: DOCKER_USER: from_secret: docker_username PUSHRM_FILE: README.md - PUSHRM_SHORT: Custom image for BitwardenRS password manager + PUSHRM_SHORT: Custom image for Vaultwarden password manager PUSHRM_TARGET: thegeeklab/${DRONE_REPO_NAME} when: status: @@ -213,6 +213,6 @@ depends_on: --- kind: signature -hmac: c1f71df37bfce556285d58d53afe878fc713508762424bf18da8e19c1cd67940 +hmac: c154ec6b9e2c325bc15353640277a9e618e69cbd5e433c9439e833e2694aba4e ... diff --git a/Dockerfile b/Dockerfile index 67fadbd..9f8bcc5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,22 +2,23 @@ FROM thegeeklab/alpine:latest@sha256:3de659c1a479d9d80e9c3924227981450af3a068087 LABEL maintainer="Robert Kaussow " LABEL org.opencontainers.image.authors="Robert Kaussow " -LABEL org.opencontainers.image.title="bitwardenrs" -LABEL org.opencontainers.image.url="https://gitea.rknet.org/docker/bitwardenrs" -LABEL org.opencontainers.image.source="https://gitea.rknet.org/docker/bitwardenrs" -LABEL org.opencontainers.image.documentation="https://gitea.rknet.org/docker/bitwardenrs" +LABEL org.opencontainers.image.title="vaultwarden" +LABEL org.opencontainers.image.url="https://gitea.rknet.org/docker/vaultwarden" +LABEL org.opencontainers.image.source="https://gitea.rknet.org/docker/vaultwarden" +LABEL org.opencontainers.image.documentation="https://gitea.rknet.org/docker/vaultwarden" + +ARG WEBWEBVAULT_VERSION -ARG VAULT_VERSION # renovate: datasource=github-releases depName=dani-garcia/bw_web_builds -ENV VAULT_VERSION="${VAULT_VERSION:-v2.19.0}" +ENV WEBVAULT_VERSION="${WEBVAULT_VERSION:-v2.19.0d}" ADD overlay/ / RUN apk --update add --virtual .build-deps tar curl && \ apk --update add openssl postgresql-libs sqlite ca-certificates && \ mkdir -p /app/web-vault /app/data && \ - echo "Using Web Vault version '${VAULT_VERSION##v}' ..." && \ - curl -SsL "https://github.com/dani-garcia/bw_web_builds/releases/download/${VAULT_VERSION}/bw_web_${VAULT_VERSION}.tar.gz" | \ + echo "Using Web Vault version '${WEBVAULT_VERSION##v}' ..." && \ + curl -SsL "https://github.com/dani-garcia/bw_web_builds/releases/download/${WEBVAULT_VERSION}/bw_web_${WEBVAULT_VERSION}.tar.gz" | \ tar xz -C /app && \ apk del .build-deps && \ rm -rf /var/cache/apk/* && \ @@ -25,7 +26,7 @@ RUN apk --update add --virtual .build-deps tar curl && \ chown -R app:app /app ADD src/Rocket.toml /app -ADD src/target/x86_64-unknown-linux-musl/release/bitwarden_rs /app +ADD src/target/x86_64-unknown-linux-musl/release/vaultwarden /app VOLUME /app/data diff --git a/Makefile b/Makefile index 2981567..27837f9 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,10 @@ -# renovate: datasource=github-releases depName=dani-garcia/bitwarden_rs -export BUILD_VERSION ?= 1.20.0 +# renovate: datasource=github-releases depName=dani-garcia/vaultwarden +export BUILD_VERSION ?= 1.21.0 export DEBIAN_FRONTEND ?= noninteractive export LANG ?= C.UTF-8 export TZ ?= UTC +export RUSTFLAGS ?= -C link-arg=-s + DB ?= sqlite,postgresql SRC := src @@ -15,7 +17,7 @@ build: build-src build-bin .PHONY: build-src build-src: mkdir -p $(SRC); \ - curl -sSL "https://github.com/dani-garcia/bitwarden_rs/archive/$${BUILD_VERSION##v}.tar.gz" | tar xz -C $(SRC) --strip-components=1 + curl -sSL "https://github.com/dani-garcia/vaultwarden/archive/$${BUILD_VERSION##v}.tar.gz" | tar xz -C $(SRC) --strip-components=1 .PHONY: build-bin build-bin: diff --git a/README.md b/README.md index 50b7ade..f58e671 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,14 @@ -# bitwardenrs +# vaultwarden -Custom image for BitwardenRS password manager +Custom image for VAULTWARDEN password manager -[![Build Status](https://img.shields.io/drone/build/docker/bitwardenrs?logo=drone&server=https%3A%2F%2Fdrone.rknet.org)](https://drone.rknet.org/docker/bitwardenrs) -[![Docker Hub](https://img.shields.io/badge/dockerhub-latest-blue.svg?logo=docker&logoColor=white)](https://hub.docker.com/r/thegeeklab/bitwardenrs) -[![Quay.io](https://img.shields.io/badge/quay-latest-blue.svg?logo=docker&logoColor=white)](https://quay.io/repository/thegeeklab/bitwardenrs) -[![Source: Gitea](https://img.shields.io/badge/source-gitea-blue.svg?logo=gitea&logoColor=white)](https://gitea.rknet.org/docker/bitwardenrs) -[![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](https://gitea.rknet.org/docker/bitwardenrs/src/branch/main/LICENSE) +[![Build Status](https://img.shields.io/drone/build/docker/vaultwarden?logo=drone&server=https%3A%2F%2Fdrone.rknet.org)](https://drone.rknet.org/docker/vaultwarden) +[![Docker Hub](https://img.shields.io/badge/dockerhub-latest-blue.svg?logo=docker&logoColor=white)](https://hub.docker.com/r/thegeeklab/vaultwarden) +[![Quay.io](https://img.shields.io/badge/quay-latest-blue.svg?logo=docker&logoColor=white)](https://quay.io/repository/thegeeklab/vaultwarden) +[![Source: Gitea](https://img.shields.io/badge/source-gitea-blue.svg?logo=gitea&logoColor=white)](https://gitea.rknet.org/docker/vaultwarden) +[![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](https://gitea.rknet.org/docker/vaultwarden/src/branch/main/LICENSE) -This is a rootless custom Docker image for [bitwarden_rs](https://github.com/dani-garcia/bitwarden_rs). Bitwarden_rs is a Bitwarden server API implementation written in Rust compatible with upstream Bitwarden clients, perfect for self-hosted deployment where running the official resource-heavy service might not be ideal. +This is a rootless custom Docker image for [vaultwarden](https://github.com/dani-garcia/vaultwarden). Vaultwarden is a Bitwarden server API implementation written in Rust compatible with upstream Bitwarden clients, perfect for self-hosted deployment where running the official resource-heavy service might not be ideal. > **WARNING**: This build supports SQLite and PostgreSQL database backend only. @@ -16,64 +16,64 @@ This is a rootless custom Docker image for [bitwarden_rs](https://github.com/dan ### Docker Compose -Please take a look at the [example](https://gitea.rknet.org/docker/bitwardenrs/src/branch/main/docker-compose.yml) compose file from the git repo. +Please take a look at the [example](https://gitea.rknet.org/docker/vaultwarden/src/branch/main/docker-compose.yml) compose file from the git repo. ## Configuration ```Shell -BITWARDENRS_DATABASE_URL= +VAULTWARDEN_DATABASE_URL= -BITWARDENRS_TEMPLATES_FOLDER= -BITWARDENRS_RELOAD_TEMPLATES=False +VAULTWARDEN_TEMPLATES_FOLDER= +VAULTWARDEN_RELOAD_TEMPLATES=False -BITWARDENRS_IP_HEADER=X-Client-IP +VAULTWARDEN_IP_HEADER=X-Client-IP -BITWARDENRS_ICON_CACHE_TTL=2592000 -BITWARDENRS_ICON_CACHE_NEGTTL=259200 +VAULTWARDEN_ICON_CACHE_TTL=2592000 +VAULTWARDEN_ICON_CACHE_NEGTTL=259200 -BITWARDENRS_WEB_VAULT_ENABLED=True -BITWARDENRS_WEBSOCKET_ENABLED=False +VAULTWARDEN_WEB_VAULT_ENABLED=True +VAULTWARDEN_WEBSOCKET_ENABLED=False -BITWARDENRS_EXTENDED_LOGGING=True -BITWARDENRS_LOG_LEVEL=Info +VAULTWARDEN_EXTENDED_LOGGING=True +VAULTWARDEN_LOG_LEVEL=Info -BITWARDENRS_DISABLE_ICON_DOWNLOAD=False -BITWARDENRS_ICON_DOWNLOAD_TIMEOUT=10 -BITWARDENRS_ICON_BLACKLIST_REGEXL= -BITWARDENRS_ICON_BLACKLIST_NON_GLOBAL_IPS=True +VAULTWARDEN_DISABLE_ICON_DOWNLOAD=False +VAULTWARDEN_ICON_DOWNLOAD_TIMEOUT=10 +VAULTWARDEN_ICON_BLACKLIST_REGEXL= +VAULTWARDEN_ICON_BLACKLIST_NON_GLOBAL_IPS=True -BITWARDENRS_DISABLE_2FA_REMEMBER=False -BITWARDENRS_SIGNUPS_ALLOWED=True -BITWARDENRS_SIGNUPS_VERIFY=False -BITWARDENRS_SIGNUPS_VERIFY_RESEND_TIME=3600 -BITWARDENRS_SIGNUPS_VERIFY_RESEND_LIMIT=6 -BITWARDENRS_SIGNUPS_DOMAINS_WHITELIST= +VAULTWARDEN_DISABLE_2FA_REMEMBER=False +VAULTWARDEN_SIGNUPS_ALLOWED=True +VAULTWARDEN_SIGNUPS_VERIFY=False +VAULTWARDEN_SIGNUPS_VERIFY_RESEND_TIME=3600 +VAULTWARDEN_SIGNUPS_VERIFY_RESEND_LIMIT=6 +VAULTWARDEN_SIGNUPS_DOMAINS_WHITELIST= -BITWARDENRS_INVITATIONS_ALLOWED=True +VAULTWARDEN_INVITATIONS_ALLOWED=True # Set an indicidual admin token to enable the admin UI -BITWARDENRS_ADMIN_TOKEN= +VAULTWARDEN_ADMIN_TOKEN= -BITWARDENRS_PASSWORD_ITERATIONS=100000 -BITWARDENRS_SHOW_PASSWORD_HINT=True -BITWARDENRS_DOMAIN=http://localhost/ +VAULTWARDEN_PASSWORD_ITERATIONS=100000 +VAULTWARDEN_SHOW_PASSWORD_HINT=True +VAULTWARDEN_DOMAIN=http://localhost/ -BITWARDENRS_AUTHENTICATOR_DISABLE_TIME_DRIFT=False +VAULTWARDEN_AUTHENTICATOR_DISABLE_TIME_DRIFT=False # If you dont set a smtp host, all other smpt settings will be ignored -BITWARDENRS_SMTP_HOST= -BITWARDENRS_SMTP_FROM= -BITWARDENRS_SMTP_FROM_NAME=Bitwarden_RS -BITWARDENRS_SMTP_PORT=587 -BITWARDENRS_SMTP_SSL=True -BITWARDENRS_SMTP_USERNAME= -BITWARDENRS_SMTP_PASSWORD= -BITWARDENRS_SMTP_AUTH_MECHANISM=Plain -BITWARDENRS_SMTP_TIMEOUT=15 +VAULTWARDEN_SMTP_HOST= +VAULTWARDEN_SMTP_FROM= +VAULTWARDEN_SMTP_FROM_NAME=vaultwarden +VAULTWARDEN_SMTP_PORT=587 +VAULTWARDEN_SMTP_SSL=True +VAULTWARDEN_SMTP_USERNAME= +VAULTWARDEN_SMTP_PASSWORD= +VAULTWARDEN_SMTP_AUTH_MECHANISM=Plain +VAULTWARDEN_SMTP_TIMEOUT=15 -BITWARDENRS_ROCKET_WORKERS= +VAULTWARDEN_ROCKET_WORKERS= ``` ## License -This project is licensed under the MIT License - see the [LICENSE](https://gitea.rknet.org/docker/bitwardenrs/src/branch/main/LICENSE) file for details. +This project is licensed under the MIT License - see the [LICENSE](https://gitea.rknet.org/docker/vaultwarden/src/branch/main/LICENSE) file for details. diff --git a/docker-compose.yml b/docker-compose.yml index 4b3aa1f..12b99c1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,13 +6,13 @@ services: container_name: postgres image: postgres environment: - POSTGRES_DB: bitwarden + POSTGRES_DB: vaultwarden POSTGRES_PASSWORD: pass POSTGRES_USER: user - bitwardenrs: - container_name: bitwardenrs - image: thegeeklab/bitwardenrs + vaultwarden: + container_name: vaultwarden + image: thegeeklab/vaultwarden depends_on: - postgres ports: @@ -20,8 +20,8 @@ services: volumes: - data:/app/data environment: - BITWARDENRS_DATABASE_URL: postgresql://user:pass@bitwardenrs_postgres:5432/bitwarden - BITWARDENRS_ADMIN_TOKEN: test + VAULTWARDEN_DATABASE_URL: postgresql://user:pass@vaultwarden_postgres:5432/vaultwarden + VAULTWARDEN_ADMIN_TOKEN: test volumes: data: diff --git a/overlay/etc/templates/env.tmpl b/overlay/etc/templates/env.tmpl index 6c55a72..f725fd3 100644 --- a/overlay/etc/templates/env.tmpl +++ b/overlay/etc/templates/env.tmpl @@ -1,85 +1,85 @@ -## Bitwarden_RS Configuration File +## Vaultwarden Configuration File DATA_FOLDER=/app/data RSA_KEY_FILENAME=/app/data/rsa_key ICON_CACHE_FOLDER=/app/data/icon_cache ATTACHMENTS_FOLDER=/app/data/attachments -{{ if (getenv "BITWARDENRS_DATABASE_URL") -}} -DATABASE_URL={{ getenv "BITWARDENRS_DATABASE_URL" }} +{{ if (getenv "VAULTWARDEN_DATABASE_URL") -}} +DATABASE_URL={{ getenv "VAULTWARDEN_DATABASE_URL" }} {{ end -}} -USER_ATTACHMENT_LIMIT={{ getenv "BITWARDENRS_USER_ATTACHMENT_LIMIT" "1024" }} -ORG_ATTACHMENT_LIMIT={{ getenv "BITWARDENRS_ORG_ATTACHMENT_LIMIT" "1024" }} +USER_ATTACHMENT_LIMIT={{ getenv "VAULTWARDEN_USER_ATTACHMENT_LIMIT" "1024" }} +ORG_ATTACHMENT_LIMIT={{ getenv "VAULTWARDEN_ORG_ATTACHMENT_LIMIT" "1024" }} -{{ if (getenv "BITWARDENRS_TEMPLATES_FOLDER") -}} -TEMPLATES_FOLDER={{ getenv "BITWARDENRS_TEMPLATES_FOLDER" }} +{{ if (getenv "VAULTWARDEN_TEMPLATES_FOLDER") -}} +TEMPLATES_FOLDER={{ getenv "VAULTWARDEN_TEMPLATES_FOLDER" }} {{ end -}} -RELOAD_TEMPLATES={{ getenv "BITWARDENRS_RELOAD_TEMPLATES" "false" | conv.Bool }} +RELOAD_TEMPLATES={{ getenv "VAULTWARDEN_RELOAD_TEMPLATES" "false" | conv.Bool }} -IP_HEADER={{ getenv "BITWARDENRS_IP_HEADER" "X-Client-IP" }} +IP_HEADER={{ getenv "VAULTWARDEN_IP_HEADER" "X-Client-IP" }} -ICON_CACHE_TTL={{ getenv "BITWARDENRS_ICON_CACHE_TTL" "2592000" }} -ICON_CACHE_NEGTTL={{ getenv "BITWARDENRS_ICON_CACHE_NEGTTL" "259200" }} +ICON_CACHE_TTL={{ getenv "VAULTWARDEN_ICON_CACHE_TTL" "2592000" }} +ICON_CACHE_NEGTTL={{ getenv "VAULTWARDEN_ICON_CACHE_NEGTTL" "259200" }} WEB_VAULT_FOLDER=/app/web-vault/ -WEB_VAULT_ENABLED={{ getenv "BITWARDENRS_WEB_VAULT_ENABLED" "true" | conv.Bool }} +WEB_VAULT_ENABLED={{ getenv "VAULTWARDEN_WEB_VAULT_ENABLED" "true" | conv.Bool }} -WEBSOCKET_ENABLED={{ getenv "BITWARDENRS_WEBSOCKET_ENABLED" "false" | conv.Bool }} +WEBSOCKET_ENABLED={{ getenv "VAULTWARDEN_WEBSOCKET_ENABLED" "false" | conv.Bool }} WEBSOCKET_ADDRESS=0.0.0.0 WEBSOCKET_PORT=3012 -EXTENDED_LOGGING={{ getenv "BITWARDENRS_EXTENDED_LOGGING" "true" | conv.Bool }} -LOG_LEVEL={{ getenv "BITWARDENRS_LOG_LEVEL" "Info" }} +EXTENDED_LOGGING={{ getenv "VAULTWARDEN_EXTENDED_LOGGING" "true" | conv.Bool }} +LOG_LEVEL={{ getenv "VAULTWARDEN_LOG_LEVEL" "Info" }} ENABLE_DB_WAL=true -DISABLE_ICON_DOWNLOAD={{ getenv "BITWARDENRS_DISABLE_ICON_DOWNLOAD" "false" | conv.Bool }} -ICON_DOWNLOAD_TIMEOUT={{ getenv "BITWARDENRS_ICON_DOWNLOAD_TIMEOUT" "10" }} -{{ if (getenv "BITWARDENRS_ICON_BLACKLIST_REGEXL") -}} -ICON_BLACKLIST_REGEX={{ getenv "BITWARDENRS_ICON_BLACKLIST_REGEXL" }} +DISABLE_ICON_DOWNLOAD={{ getenv "VAULTWARDEN_DISABLE_ICON_DOWNLOAD" "false" | conv.Bool }} +ICON_DOWNLOAD_TIMEOUT={{ getenv "VAULTWARDEN_ICON_DOWNLOAD_TIMEOUT" "10" }} +{{ if (getenv "VAULTWARDEN_ICON_BLACKLIST_REGEXL") -}} +ICON_BLACKLIST_REGEX={{ getenv "VAULTWARDEN_ICON_BLACKLIST_REGEXL" }} {{ end -}} -ICON_BLACKLIST_NON_GLOBAL_IPS={{ getenv "BITWARDENRS_ICON_BLACKLIST_NON_GLOBAL_IPS" "true" | conv.Bool }} +ICON_BLACKLIST_NON_GLOBAL_IPS={{ getenv "VAULTWARDEN_ICON_BLACKLIST_NON_GLOBAL_IPS" "true" | conv.Bool }} -DISABLE_2FA_REMEMBER={{ getenv "BITWARDENRS_DISABLE_2FA_REMEMBER" "false" | conv.Bool }} +DISABLE_2FA_REMEMBER={{ getenv "VAULTWARDEN_DISABLE_2FA_REMEMBER" "false" | conv.Bool }} -SIGNUPS_ALLOWED={{ getenv "BITWARDENRS_SIGNUPS_ALLOWED" "true" | conv.Bool }} -SIGNUPS_VERIFY={{ getenv "BITWARDENRS_SIGNUPS_VERIFY" "false" | conv.Bool }} -SIGNUPS_VERIFY_RESEND_TIME={{ getenv "BITWARDENRS_SIGNUPS_VERIFY_RESEND_TIME" "3600" }} -SIGNUPS_VERIFY_RESEND_LIMIT={{ getenv "BITWARDENRS_SIGNUPS_VERIFY_RESEND_LIMIT" "6" }} -{{ if (getenv "BITWARDENRS_SIGNUPS_DOMAINS_WHITELIST") -}} -SIGNUPS_DOMAINS_WHITELIST={{ getenv "BITWARDENRS_SIGNUPS_DOMAINS_WHITELIST" }} +SIGNUPS_ALLOWED={{ getenv "VAULTWARDEN_SIGNUPS_ALLOWED" "true" | conv.Bool }} +SIGNUPS_VERIFY={{ getenv "VAULTWARDEN_SIGNUPS_VERIFY" "false" | conv.Bool }} +SIGNUPS_VERIFY_RESEND_TIME={{ getenv "VAULTWARDEN_SIGNUPS_VERIFY_RESEND_TIME" "3600" }} +SIGNUPS_VERIFY_RESEND_LIMIT={{ getenv "VAULTWARDEN_SIGNUPS_VERIFY_RESEND_LIMIT" "6" }} +{{ if (getenv "VAULTWARDEN_SIGNUPS_DOMAINS_WHITELIST") -}} +SIGNUPS_DOMAINS_WHITELIST={{ getenv "VAULTWARDEN_SIGNUPS_DOMAINS_WHITELIST" }} {{ end -}} -INVITATIONS_ALLOWED={{ getenv "BITWARDENRS_INVITATIONS_ALLOWED" "true" | conv.Bool }} -INVITATION_ORG_NAME={{ getenv "BITWARDENRS_INVITATION_ORG_NAME" "Bitwarden_RS" }} +INVITATIONS_ALLOWED={{ getenv "VAULTWARDEN_INVITATIONS_ALLOWED" "true" | conv.Bool }} +INVITATION_ORG_NAME={{ getenv "VAULTWARDEN_INVITATION_ORG_NAME" "Vaultwarden" }} -{{ if (getenv "BITWARDENRS_ADMIN_TOKEN") -}} -ADMIN_TOKEN={{ getenv "BITWARDENRS_ADMIN_TOKEN" }} +{{ if (getenv "VAULTWARDEN_ADMIN_TOKEN") -}} +ADMIN_TOKEN={{ getenv "VAULTWARDEN_ADMIN_TOKEN" }} {{ end -}} DISABLE_ADMIN_TOKEN=false -PASSWORD_ITERATIONS={{ getenv "BITWARDENRS_PASSWORD_ITERATIONS" "100000" }} -SHOW_PASSWORD_HINT={{ getenv "BITWARDENRS_SHOW_PASSWORD_HINT" "true" | conv.Bool }} -DOMAIN={{ getenv "BITWARDENRS_DOMAIN" "http://localhost/" }} +PASSWORD_ITERATIONS={{ getenv "VAULTWARDEN_PASSWORD_ITERATIONS" "100000" }} +SHOW_PASSWORD_HINT={{ getenv "VAULTWARDEN_SHOW_PASSWORD_HINT" "true" | conv.Bool }} +DOMAIN={{ getenv "VAULTWARDEN_DOMAIN" "http://localhost/" }} -AUTHENTICATOR_DISABLE_TIME_DRIFT={{ getenv "BITWARDENRS_AUTHENTICATOR_DISABLE_TIME_DRIFT" "false" | conv.Bool }} +AUTHENTICATOR_DISABLE_TIME_DRIFT={{ getenv "VAULTWARDEN_AUTHENTICATOR_DISABLE_TIME_DRIFT" "false" | conv.Bool }} ROCKET_ADDRESS=0.0.0.0 ROCKET_PORT=8080 -{{ if (getenv "BITWARDENRS_ROCKET_WORKERS") -}} -ROCKET_WORKERS={{ getenv "BITWARDENRS_ROCKET_WORKERS" }} +{{ if (getenv "VAULTWARDEN_ROCKET_WORKERS") -}} +ROCKET_WORKERS={{ getenv "VAULTWARDEN_ROCKET_WORKERS" }} {{ end -}} -{{ if (getenv "BITWARDENRS_SMTP_HOST") -}} -SMTP_HOST={{ getenv "BITWARDENRS_SMTP_HOST" }} -SMTP_FROM={{ getenv "BITWARDENRS_SMTP_FROM" }} -SMTP_FROM_NAME={{ getenv "BITWARDENRS_SMTP_FROM_NAME" "Bitwarden_RS" }} -SMTP_PORT={{ getenv "BITWARDENRS_SMTP_PORT" "587" }} -SMTP_SSL={{ getenv "BITWARDENRS_SMTP_SSL" "true" | conv.Bool }} -{{ if (getenv "BITWARDENRS_SMTP_USERNAME") -}} -SMTP_USERNAME={{ getenv "BITWARDENRS_SMTP_USERNAME" }} -SMTP_PASSWORD={{ getenv "BITWARDENRS_SMTP_PASSWORD" }} +{{ if (getenv "VAULTWARDEN_SMTP_HOST") -}} +SMTP_HOST={{ getenv "VAULTWARDEN_SMTP_HOST" }} +SMTP_FROM={{ getenv "VAULTWARDEN_SMTP_FROM" }} +SMTP_FROM_NAME={{ getenv "VAULTWARDEN_SMTP_FROM_NAME" "Vaultwarden" }} +SMTP_PORT={{ getenv "VAULTWARDEN_SMTP_PORT" "587" }} +SMTP_SSL={{ getenv "VAULTWARDEN_SMTP_SSL" "true" | conv.Bool }} +{{ if (getenv "VAULTWARDEN_SMTP_USERNAME") -}} +SMTP_USERNAME={{ getenv "VAULTWARDEN_SMTP_USERNAME" }} +SMTP_PASSWORD={{ getenv "VAULTWARDEN_SMTP_PASSWORD" }} {{ end -}} -SMTP_AUTH_MECHANISM={{ getenv "BITWARDENRS_SMTP_AUTH_MECHANISM" "Plain" }} -SMTP_TIMEOUT={{ getenv "BITWARDENRS_SMTP_TIMEOUT" "15" }} +SMTP_AUTH_MECHANISM={{ getenv "VAULTWARDEN_SMTP_AUTH_MECHANISM" "Plain" }} +SMTP_TIMEOUT={{ getenv "VAULTWARDEN_SMTP_TIMEOUT" "15" }} {{ end -}} diff --git a/overlay/usr/local/bin/entrypoint b/overlay/usr/local/bin/entrypoint index ea8af22..ae41926 100755 --- a/overlay/usr/local/bin/entrypoint +++ b/overlay/usr/local/bin/entrypoint @@ -4,14 +4,14 @@ set -eo pipefail /usr/local/bin/gomplate -o /app/.env -f /etc/templates/env.tmpl -if [ -n "$BITWARDENRS_DATABASE_URL" ] +if [ -n "$VAULTWARDEN_DATABASE_URL" ] then - WAITFOR_HOST=$(/usr/local/bin/url-parser host --url "$BITWARDENRS_DATABASE_URL") - WAITFOR_PORT=$(/usr/local/bin/url-parser port --url "$BITWARDENRS_DATABASE_URL") + WAITFOR_HOST=$(/usr/local/bin/url-parser host --url "$VAULTWARDEN_DATABASE_URL") + WAITFOR_PORT=$(/usr/local/bin/url-parser port --url "$VAULTWARDEN_DATABASE_URL") printf "Wait for database server on '%s:%s' ...\n" "${WAITFOR_HOST}" "${WAITFOR_PORT:-5432}" /usr/local/bin/wait-for "${WAITFOR_HOST}":"${WAITFOR_PORT:-5432}" fi -printf "Start Bitwarden Server ...\n" -exec /app/bitwarden_rs +printf "Start Vaultwarden Server ...\n" +exec /app/vaultwarden diff --git a/renovate.json b/renovate.json index 90fdbf9..19ee96c 100644 --- a/renovate.json +++ b/renovate.json @@ -3,7 +3,7 @@ "extends": ["github>thegeeklab/renovate-presets:docker"], "packageRules": [ { - "groupName": "bitwarden packages", + "groupName": "vaultwarden packages", "matchDatasources": ["github-releases"], "matchPackagePatterns": ["^dani-garcia"] }