add sqlite support
Some checks are pending
continuous-integration/drone/push Build is pending

This commit is contained in:
Robert Kaussow 2020-10-17 23:17:18 +02:00
parent bf154e0166
commit 505666fbee
No known key found for this signature in database
GPG Key ID: 65362AE74AF98B61
5 changed files with 9 additions and 5 deletions

View File

@ -8,7 +8,7 @@ platform:
steps: steps:
- name: binary - name: binary
image: clux/muslrust:nightly-2020-03-09 image: clux/muslrust:nightly-2020-10-02
commands: commands:
- apt-get -qq update && apt-get install -yqq --no-install-recommends libpq-dev - apt-get -qq update && apt-get install -yqq --no-install-recommends libpq-dev
- make build - make build

View File

@ -13,7 +13,7 @@ ENV VAULT_VERSION="${VAULT_VERSION:-v2.16.1}"
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 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 '${VAULT_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/${VAULT_VERSION}/bw_web_${VAULT_VERSION}.tar.gz" | \

View File

@ -3,7 +3,7 @@ export BUILD_VERSION ?= 1.17.0
export DEBIAN_FRONTEND ?= noninteractive export DEBIAN_FRONTEND ?= noninteractive
export LANG ?= C.UTF-8 export LANG ?= C.UTF-8
export TZ ?= UTC export TZ ?= UTC
DB ?= postgresql DB ?= sqlite,postgresql
SRC := src SRC := src
.PHONY: all .PHONY: all

View File

@ -4,7 +4,9 @@ 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") -}}
DATABASE_URL={{ getenv "BITWARDENRS_DATABASE_URL" }} DATABASE_URL={{ getenv "BITWARDENRS_DATABASE_URL" }}
{{ end -}}
USER_ATTACHMENT_LIMIT={{ getenv "BITWARDENRS_USER_ATTACHMENT_LIMIT" "1024" }} USER_ATTACHMENT_LIMIT={{ getenv "BITWARDENRS_USER_ATTACHMENT_LIMIT" "1024" }}
ORG_ATTACHMENT_LIMIT={{ getenv "BITWARDENRS_ORG_ATTACHMENT_LIMIT" "1024" }} ORG_ATTACHMENT_LIMIT={{ getenv "BITWARDENRS_ORG_ATTACHMENT_LIMIT" "1024" }}
@ -63,6 +65,9 @@ AUTHENTICATOR_DISABLE_TIME_DRIFT={{ getenv "BITWARDENRS_AUTHENTICATOR_DISABLE_TI
ROCKET_ADDRESS=0.0.0.0 ROCKET_ADDRESS=0.0.0.0
ROCKET_PORT=8080 ROCKET_PORT=8080
{{ if (getenv "BITWARDENRS_ROCKET_WORKERS") -}}
ROCKET_WORKERS={{ getenv "BITWARDENRS_ROCKET_WORKERS" }}
{{ end -}}
{{ if (getenv "BITWARDENRS_SMTP_HOST") -}} {{ if (getenv "BITWARDENRS_SMTP_HOST") -}}
SMTP_HOST={{ getenv "BITWARDENRS_SMTP_HOST" }} SMTP_HOST={{ getenv "BITWARDENRS_SMTP_HOST" }}

View File

@ -21,6 +21,5 @@
"groupName": "bitwarden_rs packages", "groupName": "bitwarden_rs packages",
"packagePatterns": ["^dani-garcia"] "packagePatterns": ["^dani-garcia"]
} }
], ]
"masterIssue": true
} }