chore: upstream project was renamed to vaultwarden
Some checks failed
continuous-integration/drone/pr Build is failing
Some checks failed
continuous-integration/drone/pr Build is failing
This commit is contained in:
parent
f891eb75d7
commit
286708c5e7
@ -2,7 +2,7 @@ style: github
|
|||||||
template: CHANGELOG.tpl.md
|
template: CHANGELOG.tpl.md
|
||||||
info:
|
info:
|
||||||
title: CHANGELOG
|
title: CHANGELOG
|
||||||
repository_url: https://gitea.rknet.org/docker/bitwardenrs
|
repository_url: https://gitea.rknet.org/docker/vaultwarden
|
||||||
options:
|
options:
|
||||||
commit_groups:
|
commit_groups:
|
||||||
title_maps:
|
title_maps:
|
||||||
|
@ -38,8 +38,8 @@ steps:
|
|||||||
- name: verify
|
- name: verify
|
||||||
image: alpine
|
image: alpine
|
||||||
commands:
|
commands:
|
||||||
- src/target/x86_64-unknown-linux-musl/release/bitwarden_rs --help
|
- src/target/x86_64-unknown-linux-musl/release/vaultwarden --help
|
||||||
- src/target/x86_64-unknown-linux-musl/release/bitwarden_rs --version
|
- src/target/x86_64-unknown-linux-musl/release/vaultwarden --version
|
||||||
depends_on:
|
depends_on:
|
||||||
- binary
|
- binary
|
||||||
|
|
||||||
@ -165,7 +165,7 @@ steps:
|
|||||||
DOCKER_USER:
|
DOCKER_USER:
|
||||||
from_secret: docker_username
|
from_secret: docker_username
|
||||||
PUSHRM_FILE: README.md
|
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}
|
PUSHRM_TARGET: thegeeklab/${DRONE_REPO_NAME}
|
||||||
when:
|
when:
|
||||||
status:
|
status:
|
||||||
@ -213,6 +213,6 @@ depends_on:
|
|||||||
|
|
||||||
---
|
---
|
||||||
kind: signature
|
kind: signature
|
||||||
hmac: c1f71df37bfce556285d58d53afe878fc713508762424bf18da8e19c1cd67940
|
hmac: 79d767ccd20f9916325092da726004799c3087569412118ee1056182bdc254e1
|
||||||
|
|
||||||
...
|
...
|
||||||
|
10
Dockerfile
10
Dockerfile
@ -2,10 +2,10 @@ FROM thegeeklab/alpine:latest@sha256:3de659c1a479d9d80e9c3924227981450af3a068087
|
|||||||
|
|
||||||
LABEL maintainer="Robert Kaussow <mail@thegeeklab.de>"
|
LABEL maintainer="Robert Kaussow <mail@thegeeklab.de>"
|
||||||
LABEL org.opencontainers.image.authors="Robert Kaussow <mail@thegeeklab.de>"
|
LABEL org.opencontainers.image.authors="Robert Kaussow <mail@thegeeklab.de>"
|
||||||
LABEL org.opencontainers.image.title="bitwardenrs"
|
LABEL org.opencontainers.image.title="vaultwarden"
|
||||||
LABEL org.opencontainers.image.url="https://gitea.rknet.org/docker/bitwardenrs"
|
LABEL org.opencontainers.image.url="https://gitea.rknet.org/docker/vaultwarden"
|
||||||
LABEL org.opencontainers.image.source="https://gitea.rknet.org/docker/bitwardenrs"
|
LABEL org.opencontainers.image.source="https://gitea.rknet.org/docker/vaultwarden"
|
||||||
LABEL org.opencontainers.image.documentation="https://gitea.rknet.org/docker/bitwardenrs"
|
LABEL org.opencontainers.image.documentation="https://gitea.rknet.org/docker/vaultwarden"
|
||||||
|
|
||||||
ARG VAULT_VERSION
|
ARG VAULT_VERSION
|
||||||
# renovate: datasource=github-releases depName=dani-garcia/bw_web_builds
|
# renovate: datasource=github-releases depName=dani-garcia/bw_web_builds
|
||||||
@ -25,7 +25,7 @@ RUN apk --update add --virtual .build-deps tar curl && \
|
|||||||
chown -R app:app /app
|
chown -R app:app /app
|
||||||
|
|
||||||
ADD src/Rocket.toml /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
|
VOLUME /app/data
|
||||||
|
|
||||||
|
4
Makefile
4
Makefile
@ -1,4 +1,4 @@
|
|||||||
# renovate: datasource=github-releases depName=dani-garcia/bitwarden_rs
|
# renovate: datasource=github-releases depName=dani-garcia/vaultwarden
|
||||||
export BUILD_VERSION ?= 1.20.0
|
export BUILD_VERSION ?= 1.20.0
|
||||||
export DEBIAN_FRONTEND ?= noninteractive
|
export DEBIAN_FRONTEND ?= noninteractive
|
||||||
export LANG ?= C.UTF-8
|
export LANG ?= C.UTF-8
|
||||||
@ -15,7 +15,7 @@ build: build-src build-bin
|
|||||||
.PHONY: build-src
|
.PHONY: build-src
|
||||||
build-src:
|
build-src:
|
||||||
mkdir -p $(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
|
.PHONY: build-bin
|
||||||
build-bin:
|
build-bin:
|
||||||
|
92
README.md
92
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)
|
[![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/bitwardenrs)
|
[![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/bitwardenrs)
|
[![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/bitwardenrs)
|
[![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/bitwardenrs/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 [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.
|
> **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
|
### 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
|
## Configuration
|
||||||
|
|
||||||
```Shell
|
```Shell
|
||||||
BITWARDENRS_DATABASE_URL=
|
VAULTWARDEN_DATABASE_URL=
|
||||||
|
|
||||||
BITWARDENRS_TEMPLATES_FOLDER=
|
VAULTWARDEN_TEMPLATES_FOLDER=
|
||||||
BITWARDENRS_RELOAD_TEMPLATES=False
|
VAULTWARDEN_RELOAD_TEMPLATES=False
|
||||||
|
|
||||||
BITWARDENRS_IP_HEADER=X-Client-IP
|
VAULTWARDEN_IP_HEADER=X-Client-IP
|
||||||
|
|
||||||
BITWARDENRS_ICON_CACHE_TTL=2592000
|
VAULTWARDEN_ICON_CACHE_TTL=2592000
|
||||||
BITWARDENRS_ICON_CACHE_NEGTTL=259200
|
VAULTWARDEN_ICON_CACHE_NEGTTL=259200
|
||||||
|
|
||||||
BITWARDENRS_WEB_VAULT_ENABLED=True
|
VAULTWARDEN_WEB_VAULT_ENABLED=True
|
||||||
BITWARDENRS_WEBSOCKET_ENABLED=False
|
VAULTWARDEN_WEBSOCKET_ENABLED=False
|
||||||
|
|
||||||
BITWARDENRS_EXTENDED_LOGGING=True
|
VAULTWARDEN_EXTENDED_LOGGING=True
|
||||||
BITWARDENRS_LOG_LEVEL=Info
|
VAULTWARDEN_LOG_LEVEL=Info
|
||||||
|
|
||||||
BITWARDENRS_DISABLE_ICON_DOWNLOAD=False
|
VAULTWARDEN_DISABLE_ICON_DOWNLOAD=False
|
||||||
BITWARDENRS_ICON_DOWNLOAD_TIMEOUT=10
|
VAULTWARDEN_ICON_DOWNLOAD_TIMEOUT=10
|
||||||
BITWARDENRS_ICON_BLACKLIST_REGEXL=
|
VAULTWARDEN_ICON_BLACKLIST_REGEXL=
|
||||||
BITWARDENRS_ICON_BLACKLIST_NON_GLOBAL_IPS=True
|
VAULTWARDEN_ICON_BLACKLIST_NON_GLOBAL_IPS=True
|
||||||
|
|
||||||
BITWARDENRS_DISABLE_2FA_REMEMBER=False
|
VAULTWARDEN_DISABLE_2FA_REMEMBER=False
|
||||||
BITWARDENRS_SIGNUPS_ALLOWED=True
|
VAULTWARDEN_SIGNUPS_ALLOWED=True
|
||||||
BITWARDENRS_SIGNUPS_VERIFY=False
|
VAULTWARDEN_SIGNUPS_VERIFY=False
|
||||||
BITWARDENRS_SIGNUPS_VERIFY_RESEND_TIME=3600
|
VAULTWARDEN_SIGNUPS_VERIFY_RESEND_TIME=3600
|
||||||
BITWARDENRS_SIGNUPS_VERIFY_RESEND_LIMIT=6
|
VAULTWARDEN_SIGNUPS_VERIFY_RESEND_LIMIT=6
|
||||||
BITWARDENRS_SIGNUPS_DOMAINS_WHITELIST=
|
VAULTWARDEN_SIGNUPS_DOMAINS_WHITELIST=
|
||||||
|
|
||||||
BITWARDENRS_INVITATIONS_ALLOWED=True
|
VAULTWARDEN_INVITATIONS_ALLOWED=True
|
||||||
|
|
||||||
# Set an indicidual admin token to enable the admin UI
|
# Set an indicidual admin token to enable the admin UI
|
||||||
BITWARDENRS_ADMIN_TOKEN=
|
VAULTWARDEN_ADMIN_TOKEN=
|
||||||
|
|
||||||
BITWARDENRS_PASSWORD_ITERATIONS=100000
|
VAULTWARDEN_PASSWORD_ITERATIONS=100000
|
||||||
BITWARDENRS_SHOW_PASSWORD_HINT=True
|
VAULTWARDEN_SHOW_PASSWORD_HINT=True
|
||||||
BITWARDENRS_DOMAIN=http://localhost/
|
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
|
# If you dont set a smtp host, all other smpt settings will be ignored
|
||||||
BITWARDENRS_SMTP_HOST=
|
VAULTWARDEN_SMTP_HOST=
|
||||||
BITWARDENRS_SMTP_FROM=
|
VAULTWARDEN_SMTP_FROM=
|
||||||
BITWARDENRS_SMTP_FROM_NAME=Bitwarden_RS
|
VAULTWARDEN_SMTP_FROM_NAME=vaultwarden
|
||||||
BITWARDENRS_SMTP_PORT=587
|
VAULTWARDEN_SMTP_PORT=587
|
||||||
BITWARDENRS_SMTP_SSL=True
|
VAULTWARDEN_SMTP_SSL=True
|
||||||
BITWARDENRS_SMTP_USERNAME=
|
VAULTWARDEN_SMTP_USERNAME=
|
||||||
BITWARDENRS_SMTP_PASSWORD=
|
VAULTWARDEN_SMTP_PASSWORD=
|
||||||
BITWARDENRS_SMTP_AUTH_MECHANISM=Plain
|
VAULTWARDEN_SMTP_AUTH_MECHANISM=Plain
|
||||||
BITWARDENRS_SMTP_TIMEOUT=15
|
VAULTWARDEN_SMTP_TIMEOUT=15
|
||||||
|
|
||||||
BITWARDENRS_ROCKET_WORKERS=
|
VAULTWARDEN_ROCKET_WORKERS=
|
||||||
```
|
```
|
||||||
|
|
||||||
## License
|
## 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.
|
||||||
|
@ -10,9 +10,9 @@ services:
|
|||||||
POSTGRES_PASSWORD: pass
|
POSTGRES_PASSWORD: pass
|
||||||
POSTGRES_USER: user
|
POSTGRES_USER: user
|
||||||
|
|
||||||
bitwardenrs:
|
vaultwarden:
|
||||||
container_name: bitwardenrs
|
container_name: vaultwarden
|
||||||
image: thegeeklab/bitwardenrs
|
image: thegeeklab/vaultwarden
|
||||||
depends_on:
|
depends_on:
|
||||||
- postgres
|
- postgres
|
||||||
ports:
|
ports:
|
||||||
@ -20,8 +20,8 @@ services:
|
|||||||
volumes:
|
volumes:
|
||||||
- data:/app/data
|
- data:/app/data
|
||||||
environment:
|
environment:
|
||||||
BITWARDENRS_DATABASE_URL: postgresql://user:pass@bitwardenrs_postgres:5432/bitwarden
|
VAULTWARDEN_DATABASE_URL: postgresql://user:pass@vaultwarden_postgres:5432/bitwarden
|
||||||
BITWARDENRS_ADMIN_TOKEN: test
|
VAULTWARDEN_ADMIN_TOKEN: test
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
data:
|
data:
|
||||||
|
@ -4,14 +4,14 @@ set -eo pipefail
|
|||||||
|
|
||||||
/usr/local/bin/gomplate -o /app/.env -f /etc/templates/env.tmpl
|
/usr/local/bin/gomplate -o /app/.env -f /etc/templates/env.tmpl
|
||||||
|
|
||||||
if [ -n "$BITWARDENRS_DATABASE_URL" ]
|
if [ -n "$VAULTWARDEN_DATABASE_URL" ]
|
||||||
then
|
then
|
||||||
WAITFOR_HOST=$(/usr/local/bin/url-parser host --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 "$BITWARDENRS_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}"
|
printf "Wait for database server on '%s:%s' ...\n" "${WAITFOR_HOST}" "${WAITFOR_PORT:-5432}"
|
||||||
/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 Bitwarden Server ...\n"
|
||||||
exec /app/bitwarden_rs
|
exec /app/vaultwarden
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
"extends": ["github>thegeeklab/renovate-presets:docker"],
|
"extends": ["github>thegeeklab/renovate-presets:docker"],
|
||||||
"packageRules": [
|
"packageRules": [
|
||||||
{
|
{
|
||||||
"groupName": "bitwarden packages",
|
"groupName": "vaultwarden packages",
|
||||||
"matchDatasources": ["github-releases"],
|
"matchDatasources": ["github-releases"],
|
||||||
"matchPackagePatterns": ["^dani-garcia"]
|
"matchPackagePatterns": ["^dani-garcia"]
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user