Spiegel von
https://github.com/dani-garcia/vaultwarden.git
synchronisiert 2024-11-14 03:52:54 +01:00
Add sqlite binary into the docker images
This is done to enable backup functionality in the admin interface while we're waiting for the libsqlite-sys 0.17 to bubble up in the upstream dependencies. Then we can start using `VACUUM INTO` This also extends the check for the sqlite binary to also try `sqlite3` as this is the name of the binary in baseimage distributions we use.
Dieser Commit ist enthalten in:
Ursprung
8367d1d715
Commit
acdd42935b
8 geänderte Dateien mit 12 neuen und 1 gelöschten Zeilen
|
@ -82,6 +82,7 @@ RUN apt-get update && apt-get install -y \
|
|||
openssl \
|
||||
ca-certificates \
|
||||
curl \
|
||||
sqlite3 \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
RUN mkdir /data
|
||||
|
|
|
@ -81,6 +81,7 @@ RUN apt-get update && apt-get install -y \
|
|||
openssl \
|
||||
ca-certificates \
|
||||
curl \
|
||||
sqlite3 \
|
||||
libpq5 \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
|
|
|
@ -64,6 +64,7 @@ RUN apk add --no-cache \
|
|||
openssl \
|
||||
postgresql-libs \
|
||||
curl \
|
||||
sqlite \
|
||||
ca-certificates
|
||||
|
||||
RUN mkdir /data
|
||||
|
|
|
@ -81,6 +81,7 @@ RUN apt-get update && apt-get install -y \
|
|||
openssl \
|
||||
ca-certificates \
|
||||
curl \
|
||||
sqlite3 \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
RUN mkdir /data
|
||||
|
|
|
@ -63,6 +63,7 @@ ENV SSL_CERT_DIR=/etc/ssl/certs
|
|||
RUN apk add --no-cache \
|
||||
openssl \
|
||||
curl \
|
||||
sqlite \
|
||||
ca-certificates
|
||||
|
||||
RUN mkdir /data
|
||||
|
|
|
@ -82,6 +82,7 @@ RUN apt-get update && apt-get install -y \
|
|||
openssl \
|
||||
ca-certificates \
|
||||
curl \
|
||||
sqlite3 \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
RUN mkdir /data
|
||||
|
|
|
@ -82,6 +82,7 @@ RUN apt-get update && apt-get install -y \
|
|||
openssl \
|
||||
ca-certificates \
|
||||
curl \
|
||||
sqlite3 \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
RUN mkdir /data
|
||||
|
|
|
@ -37,7 +37,11 @@ pub fn routes() -> Vec<Route> {
|
|||
}
|
||||
|
||||
lazy_static! {
|
||||
static ref CAN_BACKUP: bool = cfg!(feature = "sqlite") && Command::new("sqlite").arg("-version").status().is_ok();
|
||||
static ref CAN_BACKUP: bool = cfg!(feature = "sqlite") &&
|
||||
(
|
||||
Command::new("sqlite").arg("-version").status().is_ok() ||
|
||||
Command::new("sqlite3").arg("-version").status().is_ok()
|
||||
);
|
||||
}
|
||||
|
||||
#[get("/")]
|
||||
|
|
Laden …
In neuem Issue referenzieren