container/vaultwarden
1
0
Fork 0
Code Issues 1 Pull Requests Releases 61 Activity

chore: upstream project was renamed to vaultwarden #41

Merged
xoxys merged 6 commits from vaultwarden into main 2021-05-15 12:19:58 +00:00
Conversation 0 Commits 6 Files Changed 9 +60 -57
7 changed files with 60 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d36cb0ecc8 - Show all commits

2
.drone.yml
View File

@ -38,6 +38,8 @@ steps:
- name: verify - name: verify
image: alpine image: alpine
commands: commands:
- apk add tree
- tree
- src/target/x86_64-unknown-linux-musl/release/vaultwarden --help - src/target/x86_64-unknown-linux-musl/release/vaultwarden --help
- src/target/x86_64-unknown-linux-musl/release/vaultwarden --version - src/target/x86_64-unknown-linux-musl/release/vaultwarden --version
depends_on: depends_on:

9
Dockerfile
View File

@ -7,17 +7,18 @@ 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.source="https://gitea.rknet.org/docker/vaultwarden"
LABEL org.opencontainers.image.documentation="https://gitea.rknet.org/docker/vaultwarden" LABEL org.opencontainers.image.documentation="https://gitea.rknet.org/docker/vaultwarden"
ARG VAULT_VERSION ARG WEBWEBVAULT_VERSION
# renovate: datasource=github-releases depName=dani-garcia/bw_web_builds # 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.0}"
ADD overlay/ / ADD overlay/ /
RUN apk --update add --virtual .build-deps tar curl && \ RUN apk --update add --virtual .build-deps tar curl && \
apk --update add openssl postgresql-libs sqlite ca-certificates && \ apk --update add openssl postgresql-libs sqlite ca-certificates && \
mkdir -p /app/web-vault /app/data && \ mkdir -p /app/web-vault /app/data && \
echo "Using Web Vault version '${VAULT_VERSION##v}' ..." && \ echo "Using Web Vault version '${WEBVAULT_VERSION##v}' ..." && \
curl -SsL "https://github.com/dani-garcia/bw_web_builds/releases/download/${VAULT_VERSION}/bw_web_${VAULT_VERSION}.tar.gz" | \ curl -SsL "https://github.com/dani-garcia/bw_web_builds/releases/download/${WEBVAULT_VERSION}/bw_web_${WEBVAULT_VERSION}.tar.gz" | \
tar xz -C /app && \ tar xz -C /app && \
apk del .build-deps && \ apk del .build-deps && \
rm -rf /var/cache/apk/* && \ rm -rf /var/cache/apk/* && \

2
Makefile
View File

@ -22,7 +22,7 @@ build-bin:
rustup set profile minimal && \ rustup set profile minimal && \
cd $(SRC) && \ cd $(SRC) && \
rustup target add x86_64-unknown-linux-musl && \ rustup target add x86_64-unknown-linux-musl && \
BWRS_VERSION="$${BUILD_VERSION##v}" cargo build -j 8 --features $(DB) --release VWRS_VERSION="$${BUILD_VERSION##v}" cargo build -j 8 --features $(DB) --release
.PHONY: clean .PHONY: clean
clean: clean:

2
README.md
View File

@ -8,7 +8,7 @@ Custom image for VAULTWARDEN password manager
[![Source: Gitea](https://img.shields.io/badge/source-gitea-blue.svg?logo=gitea&logoColor=white)](https://gitea.rknet.org/docker/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) [![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 [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. 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. > **WARNING**: This build supports SQLite and PostgreSQL database backend only.

4
docker-compose.yml
View File

@ -6,7 +6,7 @@ services:
container_name: postgres container_name: postgres
image: postgres image: postgres
environment: environment:
POSTGRES_DB: bitwarden POSTGRES_DB: vaultwarden
POSTGRES_PASSWORD: pass POSTGRES_PASSWORD: pass
POSTGRES_USER: user POSTGRES_USER: user
@ -20,7 +20,7 @@ services:
volumes: volumes:
- data:/app/data - data:/app/data
environment: environment:
VAULTWARDEN_DATABASE_URL: postgresql://user:pass@vaultwarden_postgres:5432/bitwarden VAULTWARDEN_DATABASE_URL: postgresql://user:pass@vaultwarden_postgres:5432/vaultwarden
VAULTWARDEN_ADMIN_TOKEN: test VAULTWARDEN_ADMIN_TOKEN: test
volumes: volumes:

96
overlay/etc/templates/env.tmpl
View File

@ -1,85 +1,85 @@
## Bitwarden_RS Configuration File ## Vaultwarden Configuration File
DATA_FOLDER=/app/data DATA_FOLDER=/app/data
RSA_KEY_FILENAME=/app/data/rsa_key RSA_KEY_FILENAME=/app/data/rsa_key
ICON_CACHE_FOLDER=/app/data/icon_cache ICON_CACHE_FOLDER=/app/data/icon_cache
ATTACHMENTS_FOLDER=/app/data/attachments ATTACHMENTS_FOLDER=/app/data/attachments
{{ if (getenv "BITWARDENRS_DATABASE_URL") -}} {{ if (getenv "VAULTWARDEN_DATABASE_URL") -}}
DATABASE_URL={{ getenv "BITWARDENRS_DATABASE_URL" }} DATABASE_URL={{ getenv "VAULTWARDEN_DATABASE_URL" }}
{{ end -}} {{ end -}}
USER_ATTACHMENT_LIMIT={{ getenv "BITWARDENRS_USER_ATTACHMENT_LIMIT" "1024" }} USER_ATTACHMENT_LIMIT={{ getenv "VAULTWARDEN_USER_ATTACHMENT_LIMIT" "1024" }}
ORG_ATTACHMENT_LIMIT={{ getenv "BITWARDENRS_ORG_ATTACHMENT_LIMIT" "1024" }} ORG_ATTACHMENT_LIMIT={{ getenv "VAULTWARDEN_ORG_ATTACHMENT_LIMIT" "1024" }}
{{ if (getenv "BITWARDENRS_TEMPLATES_FOLDER") -}} {{ if (getenv "VAULTWARDEN_TEMPLATES_FOLDER") -}}
TEMPLATES_FOLDER={{ getenv "BITWARDENRS_TEMPLATES_FOLDER" }} TEMPLATES_FOLDER={{ getenv "VAULTWARDEN_TEMPLATES_FOLDER" }}
{{ end -}} {{ 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_TTL={{ getenv "VAULTWARDEN_ICON_CACHE_TTL" "2592000" }}
ICON_CACHE_NEGTTL={{ getenv "BITWARDENRS_ICON_CACHE_NEGTTL" "259200" }} ICON_CACHE_NEGTTL={{ getenv "VAULTWARDEN_ICON_CACHE_NEGTTL" "259200" }}
WEB_VAULT_FOLDER=/app/web-vault/ 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_ADDRESS=0.0.0.0
WEBSOCKET_PORT=3012 WEBSOCKET_PORT=3012
EXTENDED_LOGGING={{ getenv "BITWARDENRS_EXTENDED_LOGGING" "true" | conv.Bool }} EXTENDED_LOGGING={{ getenv "VAULTWARDEN_EXTENDED_LOGGING" "true" | conv.Bool }}
LOG_LEVEL={{ getenv "BITWARDENRS_LOG_LEVEL" "Info" }} LOG_LEVEL={{ getenv "VAULTWARDEN_LOG_LEVEL" "Info" }}
ENABLE_DB_WAL=true ENABLE_DB_WAL=true
DISABLE_ICON_DOWNLOAD={{ getenv "BITWARDENRS_DISABLE_ICON_DOWNLOAD" "false" | conv.Bool }} DISABLE_ICON_DOWNLOAD={{ getenv "VAULTWARDEN_DISABLE_ICON_DOWNLOAD" "false" | conv.Bool }}
ICON_DOWNLOAD_TIMEOUT={{ getenv "BITWARDENRS_ICON_DOWNLOAD_TIMEOUT" "10" }} ICON_DOWNLOAD_TIMEOUT={{ getenv "VAULTWARDEN_ICON_DOWNLOAD_TIMEOUT" "10" }}
{{ if (getenv "BITWARDENRS_ICON_BLACKLIST_REGEXL") -}} {{ if (getenv "VAULTWARDEN_ICON_BLACKLIST_REGEXL") -}}
ICON_BLACKLIST_REGEX={{ getenv "BITWARDENRS_ICON_BLACKLIST_REGEXL" }} ICON_BLACKLIST_REGEX={{ getenv "VAULTWARDEN_ICON_BLACKLIST_REGEXL" }}
{{ end -}} {{ 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_ALLOWED={{ getenv "VAULTWARDEN_SIGNUPS_ALLOWED" "true" | conv.Bool }}
SIGNUPS_VERIFY={{ getenv "BITWARDENRS_SIGNUPS_VERIFY" "false" | conv.Bool }} SIGNUPS_VERIFY={{ getenv "VAULTWARDEN_SIGNUPS_VERIFY" "false" | conv.Bool }}
SIGNUPS_VERIFY_RESEND_TIME={{ getenv "BITWARDENRS_SIGNUPS_VERIFY_RESEND_TIME" "3600" }} SIGNUPS_VERIFY_RESEND_TIME={{ getenv "VAULTWARDEN_SIGNUPS_VERIFY_RESEND_TIME" "3600" }}
SIGNUPS_VERIFY_RESEND_LIMIT={{ getenv "BITWARDENRS_SIGNUPS_VERIFY_RESEND_LIMIT" "6" }} SIGNUPS_VERIFY_RESEND_LIMIT={{ getenv "VAULTWARDEN_SIGNUPS_VERIFY_RESEND_LIMIT" "6" }}
{{ if (getenv "BITWARDENRS_SIGNUPS_DOMAINS_WHITELIST") -}} {{ if (getenv "VAULTWARDEN_SIGNUPS_DOMAINS_WHITELIST") -}}
SIGNUPS_DOMAINS_WHITELIST={{ getenv "BITWARDENRS_SIGNUPS_DOMAINS_WHITELIST" }} SIGNUPS_DOMAINS_WHITELIST={{ getenv "VAULTWARDEN_SIGNUPS_DOMAINS_WHITELIST" }}
{{ end -}} {{ end -}}
INVITATIONS_ALLOWED={{ getenv "BITWARDENRS_INVITATIONS_ALLOWED" "true" | conv.Bool }} INVITATIONS_ALLOWED={{ getenv "VAULTWARDEN_INVITATIONS_ALLOWED" "true" | conv.Bool }}
INVITATION_ORG_NAME={{ getenv "BITWARDENRS_INVITATION_ORG_NAME" "Bitwarden_RS" }} INVITATION_ORG_NAME={{ getenv "VAULTWARDEN_INVITATION_ORG_NAME" "Vaultwarden" }}
{{ if (getenv "BITWARDENRS_ADMIN_TOKEN") -}} {{ if (getenv "VAULTWARDEN_ADMIN_TOKEN") -}}
ADMIN_TOKEN={{ getenv "BITWARDENRS_ADMIN_TOKEN" }} ADMIN_TOKEN={{ getenv "VAULTWARDEN_ADMIN_TOKEN" }}
{{ end -}} {{ end -}}
DISABLE_ADMIN_TOKEN=false DISABLE_ADMIN_TOKEN=false
PASSWORD_ITERATIONS={{ getenv "BITWARDENRS_PASSWORD_ITERATIONS" "100000" }} PASSWORD_ITERATIONS={{ getenv "VAULTWARDEN_PASSWORD_ITERATIONS" "100000" }}
SHOW_PASSWORD_HINT={{ getenv "BITWARDENRS_SHOW_PASSWORD_HINT" "true" | conv.Bool }} SHOW_PASSWORD_HINT={{ getenv "VAULTWARDEN_SHOW_PASSWORD_HINT" "true" | conv.Bool }}
DOMAIN={{ getenv "BITWARDENRS_DOMAIN" "http://localhost/" }} 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_ADDRESS=0.0.0.0
ROCKET_PORT=8080 ROCKET_PORT=8080
{{ if (getenv "BITWARDENRS_ROCKET_WORKERS") -}} {{ if (getenv "VAULTWARDEN_ROCKET_WORKERS") -}}
ROCKET_WORKERS={{ getenv "BITWARDENRS_ROCKET_WORKERS" }} ROCKET_WORKERS={{ getenv "VAULTWARDEN_ROCKET_WORKERS" }}
{{ end -}} {{ end -}}
{{ if (getenv "BITWARDENRS_SMTP_HOST") -}} {{ if (getenv "VAULTWARDEN_SMTP_HOST") -}}
SMTP_HOST={{ getenv "BITWARDENRS_SMTP_HOST" }} SMTP_HOST={{ getenv "VAULTWARDEN_SMTP_HOST" }}
SMTP_FROM={{ getenv "BITWARDENRS_SMTP_FROM" }} SMTP_FROM={{ getenv "VAULTWARDEN_SMTP_FROM" }}
SMTP_FROM_NAME={{ getenv "BITWARDENRS_SMTP_FROM_NAME" "Bitwarden_RS" }} SMTP_FROM_NAME={{ getenv "VAULTWARDEN_SMTP_FROM_NAME" "Vaultwarden" }}
SMTP_PORT={{ getenv "BITWARDENRS_SMTP_PORT" "587" }} SMTP_PORT={{ getenv "VAULTWARDEN_SMTP_PORT" "587" }}
SMTP_SSL={{ getenv "BITWARDENRS_SMTP_SSL" "true" | conv.Bool }} SMTP_SSL={{ getenv "VAULTWARDEN_SMTP_SSL" "true" | conv.Bool }}
{{ if (getenv "BITWARDENRS_SMTP_USERNAME") -}} {{ if (getenv "VAULTWARDEN_SMTP_USERNAME") -}}
SMTP_USERNAME={{ getenv "BITWARDENRS_SMTP_USERNAME" }} SMTP_USERNAME={{ getenv "VAULTWARDEN_SMTP_USERNAME" }}
SMTP_PASSWORD={{ getenv "BITWARDENRS_SMTP_PASSWORD" }} SMTP_PASSWORD={{ getenv "VAULTWARDEN_SMTP_PASSWORD" }}
{{ end -}} {{ end -}}
SMTP_AUTH_MECHANISM={{ getenv "BITWARDENRS_SMTP_AUTH_MECHANISM" "Plain" }} SMTP_AUTH_MECHANISM={{ getenv "VAULTWARDEN_SMTP_AUTH_MECHANISM" "Plain" }}
SMTP_TIMEOUT={{ getenv "BITWARDENRS_SMTP_TIMEOUT" "15" }} SMTP_TIMEOUT={{ getenv "VAULTWARDEN_SMTP_TIMEOUT" "15" }}
{{ end -}} {{ end -}}

2
overlay/usr/local/bin/entrypoint
View File

@ -13,5 +13,5 @@ then
/usr/local/bin/wait-for "${WAITFOR_HOST}":"${WAITFOR_PORT:-5432}" /usr/local/bin/wait-for "${WAITFOR_HOST}":"${WAITFOR_PORT:-5432}"
fi fi
printf "Start Bitwarden Server ...\n" printf "Start Vaultwarden Server ...\n"
exec /app/vaultwarden exec /app/vaultwarden