From 505666fbee309199dbc4896c55e4d2cecc92f8c0 Mon Sep 17 00:00:00 2001
From: Robert Kaussow <mail@geeklabor.de>
Date: Sat, 17 Oct 2020 23:17:18 +0200
Subject: [PATCH] add sqlite support

---
 .drone.yml                     | 2 +-
 Dockerfile                     | 2 +-
 Makefile                       | 2 +-
 overlay/etc/templates/env.tmpl | 5 +++++
 renovate.json                  | 3 +--
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index f099f34..f08ead5 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -8,7 +8,7 @@ platform:
 
 steps:
 - name: binary
-  image: clux/muslrust:nightly-2020-03-09
+  image: clux/muslrust:nightly-2020-10-02
   commands:
   - apt-get -qq update && apt-get install -yqq --no-install-recommends libpq-dev
   - make build
diff --git a/Dockerfile b/Dockerfile
index 467ad4a..ce57dc5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,7 +13,7 @@ ENV VAULT_VERSION="${VAULT_VERSION:-v2.16.1}"
 ADD overlay/ /
 
 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 && \
     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" | \
diff --git a/Makefile b/Makefile
index 0eaefc2..33e1887 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ export BUILD_VERSION ?= 1.17.0
 export DEBIAN_FRONTEND ?= noninteractive
 export LANG ?= C.UTF-8
 export TZ ?= UTC
-DB ?= postgresql
+DB ?= sqlite,postgresql
 SRC := src
 
 .PHONY: all
diff --git a/overlay/etc/templates/env.tmpl b/overlay/etc/templates/env.tmpl
index 2aaaba1..4d9c833 100644
--- a/overlay/etc/templates/env.tmpl
+++ b/overlay/etc/templates/env.tmpl
@@ -4,7 +4,9 @@ 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" }}
+{{ end -}}
 
 USER_ATTACHMENT_LIMIT={{ getenv "BITWARDENRS_USER_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_PORT=8080
+{{ if (getenv "BITWARDENRS_ROCKET_WORKERS") -}}
+ROCKET_WORKERS={{ getenv "BITWARDENRS_ROCKET_WORKERS" }}
+{{ end -}}
 
 {{ if (getenv "BITWARDENRS_SMTP_HOST") -}}
 SMTP_HOST={{ getenv "BITWARDENRS_SMTP_HOST" }}
diff --git a/renovate.json b/renovate.json
index db96ce1..ef1806f 100644
--- a/renovate.json
+++ b/renovate.json
@@ -21,6 +21,5 @@
       "groupName": "bitwarden_rs packages",
       "packagePatterns": ["^dani-garcia"]
     }
-  ],
-  "masterIssue": true
+  ]
 }