From 7532072d50bd030bb7fd3b900af571049ef5378b Mon Sep 17 00:00:00 2001 From: Stefan Melmuk Date: Tue, 11 Oct 2022 20:31:15 +0200 Subject: [PATCH 01/14] add check if data folder is a directory --- src/main.rs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main.rs b/src/main.rs index c877c01c..126674d1 100644 --- a/src/main.rs +++ b/src/main.rs @@ -303,6 +303,10 @@ async fn check_data_folder() { } exit(1); } + if !path.is_dir() { + error!("Data folder '{}' is not a directory.", data_folder); + exit(1); + } if is_running_in_docker() && std::env::var("I_REALLY_WANT_VOLATILE_STORAGE").is_err() From 2dd508691689d4f5a9c39f411837300666f4dfc7 Mon Sep 17 00:00:00 2001 From: Stefan Melmuk Date: Wed, 12 Oct 2022 01:07:12 +0200 Subject: [PATCH 02/14] more verbose permission denied error be a bit more verbose about why a file could not be created when it is caused by a permission denied error. --- src/util.rs | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/util.rs b/src/util.rs index bdbb564e..16c0fce5 100644 --- a/src/util.rs +++ b/src/util.rs @@ -1,7 +1,7 @@ // // Web Headers and caching // -use std::io::Cursor; +use std::io::{Cursor, ErrorKind}; use rocket::{ fairing::{Fairing, Info, Kind}, @@ -311,7 +311,16 @@ pub fn file_exists(path: &str) -> bool { pub fn write_file(path: &str, content: &[u8]) -> Result<(), crate::error::Error> { use std::io::Write; - let mut f = File::create(path)?; + let mut f = match File::create(path) { + Ok(file) => file, + Err(e) => { + if e.kind() == ErrorKind::PermissionDenied { + error!("Can't create '{}': Permission denied", path); + } + return Err(From::from(e)); + } + }; + f.write_all(content)?; f.flush()?; Ok(()) From f3c8c16d7969d2d33ef2c163680a52cfb2ce6513 Mon Sep 17 00:00:00 2001 From: Jeremy Lin Date: Tue, 11 Oct 2022 21:25:29 -0700 Subject: [PATCH 03/14] Reformat CSP header for readability --- src/util.rs | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/src/util.rs b/src/util.rs index bdbb564e..afd82db1 100644 --- a/src/util.rs +++ b/src/util.rs @@ -63,16 +63,30 @@ impl Fairing for AppHeaders { // app.simplelogin.io, app.anonaddy.com, api.fastmail.com let csp = format!( "default-src 'self'; \ + object-src 'self' blob:; \ script-src 'self'{script_src}; \ style-src 'self' 'unsafe-inline'; \ - img-src 'self' data: https://haveibeenpwned.com/ https://www.gravatar.com {icon_service_csp}; \ child-src 'self' https://*.duosecurity.com https://*.duofederal.com; \ frame-src 'self' https://*.duosecurity.com https://*.duofederal.com; \ - connect-src 'self' https://api.pwnedpasswords.com/range/ https://2fa.directory/api/ https://app.simplelogin.io/api/ https://app.anonaddy.com/api/ https://api.fastmail.com/; \ - object-src 'self' blob:; \ - frame-ancestors 'self' chrome-extension://nngceckbapebfimnlniiiahkandclblb chrome-extension://jbkfoedolllekgbhcbcoahefnbanhhlh moz-extension://* {allowed_iframe_ancestors};", - icon_service_csp=CONFIG._icon_service_csp(), - allowed_iframe_ancestors=CONFIG.allowed_iframe_ancestors() + frame-ancestors 'self' \ + chrome-extension://nngceckbapebfimnlniiiahkandclblb \ + chrome-extension://jbkfoedolllekgbhcbcoahefnbanhhlh \ + moz-extension://* \ + {allowed_iframe_ancestors}; \ + img-src 'self' data: \ + https://haveibeenpwned.com/ \ + https://www.gravatar.com \ + {icon_service_csp}; \ + connect-src 'self' \ + https://api.pwnedpasswords.com/range/ \ + https://2fa.directory/api/ \ + https://app.simplelogin.io/api/ \ + https://app.anonaddy.com/api/ \ + https://api.fastmail.com/ \ + ;\ + ", + icon_service_csp = CONFIG._icon_service_csp(), + allowed_iframe_ancestors = CONFIG.allowed_iframe_ancestors() ); res.set_raw_header("Content-Security-Policy", csp); res.set_raw_header("X-Frame-Options", "SAMEORIGIN"); From b0e0d68632b2cfe2ba3da8d704e88ef67755ba71 Mon Sep 17 00:00:00 2001 From: Jeremy Lin Date: Tue, 11 Oct 2022 21:27:15 -0700 Subject: [PATCH 04/14] Update CSP for DuckDuckGo email forwarding Upstream PR: https://github.com/bitwarden/clients/pull/3630 --- src/util.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/util.rs b/src/util.rs index afd82db1..90bf7a73 100644 --- a/src/util.rs +++ b/src/util.rs @@ -60,7 +60,7 @@ impl Fairing for AppHeaders { // Leaked Passwords check: api.pwnedpasswords.com // 2FA/MFA Site check: 2fa.directory // # Mail Relay: https://bitwarden.com/blog/add-privacy-and-security-using-email-aliases-with-bitwarden/ - // app.simplelogin.io, app.anonaddy.com, api.fastmail.com + // app.simplelogin.io, app.anonaddy.com, api.fastmail.com, quack.duckduckgo.com let csp = format!( "default-src 'self'; \ object-src 'self' blob:; \ @@ -83,6 +83,7 @@ impl Fairing for AppHeaders { https://app.simplelogin.io/api/ \ https://app.anonaddy.com/api/ \ https://api.fastmail.com/ \ + https://quack.duckduckgo.com/api/email/ \ ;\ ", icon_service_csp = CONFIG._icon_service_csp(), From f49eb8eb4ddac10617f8d08854368ea6d632df11 Mon Sep 17 00:00:00 2001 From: Jeremy Lin Date: Wed, 12 Oct 2022 00:17:09 -0700 Subject: [PATCH 05/14] Add `CreationDate` to cipher response JSON Upstream PR: https://github.com/bitwarden/server/pull/2142 --- src/db/models/cipher.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/db/models/cipher.rs b/src/db/models/cipher.rs index d5f78fbe..7464fdc1 100644 --- a/src/db/models/cipher.rs +++ b/src/db/models/cipher.rs @@ -160,6 +160,7 @@ impl Cipher { "Object": "cipherDetails", "Id": self.uuid, "Type": self.atype, + "CreationDate": format_date(&self.created_at), "RevisionDate": format_date(&self.updated_at), "DeletedDate": self.deleted_at.map_or(Value::Null, |d| Value::String(format_date(&d))), "FolderId": if let Some(cipher_sync_data) = cipher_sync_data { cipher_sync_data.cipher_folders.get(&self.uuid).map(|c| c.to_string() ) } else { self.get_folder_uuid(user_uuid, conn).await }, From 677fd2ff327b4141c1c2c4cab439560da4c91cf8 Mon Sep 17 00:00:00 2001 From: Stefan Melmuk Date: Wed, 12 Oct 2022 20:15:45 +0200 Subject: [PATCH 06/14] fix link of license badge master branch has been renamed to main. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3e25e158..9591bbc9 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ [![Docker Pulls](https://img.shields.io/docker/pulls/vaultwarden/server.svg)](https://hub.docker.com/r/vaultwarden/server) [![Dependency Status](https://deps.rs/repo/github/dani-garcia/vaultwarden/status.svg)](https://deps.rs/repo/github/dani-garcia/vaultwarden) [![GitHub Release](https://img.shields.io/github/release/dani-garcia/vaultwarden.svg)](https://github.com/dani-garcia/vaultwarden/releases/latest) -[![GPL-3.0 Licensed](https://img.shields.io/github/license/dani-garcia/vaultwarden.svg)](https://github.com/dani-garcia/vaultwarden/blob/master/LICENSE.txt) +[![GPL-3.0 Licensed](https://img.shields.io/github/license/dani-garcia/vaultwarden.svg)](https://github.com/dani-garcia/vaultwarden/blob/main/LICENSE.txt) [![Matrix Chat](https://img.shields.io/matrix/vaultwarden:matrix.org.svg?logo=matrix)](https://matrix.to/#/#vaultwarden:matrix.org) Image is based on [Rust implementation of Bitwarden API](https://github.com/dani-garcia/vaultwarden). From fd334e2b7da8e01a591a03dae5e4d225fdd53904 Mon Sep 17 00:00:00 2001 From: Stefan Melmuk Date: Wed, 12 Oct 2022 20:15:45 +0200 Subject: [PATCH 07/14] fix link of license badge master branch has been renamed to main. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3e25e158..9591bbc9 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ [![Docker Pulls](https://img.shields.io/docker/pulls/vaultwarden/server.svg)](https://hub.docker.com/r/vaultwarden/server) [![Dependency Status](https://deps.rs/repo/github/dani-garcia/vaultwarden/status.svg)](https://deps.rs/repo/github/dani-garcia/vaultwarden) [![GitHub Release](https://img.shields.io/github/release/dani-garcia/vaultwarden.svg)](https://github.com/dani-garcia/vaultwarden/releases/latest) -[![GPL-3.0 Licensed](https://img.shields.io/github/license/dani-garcia/vaultwarden.svg)](https://github.com/dani-garcia/vaultwarden/blob/master/LICENSE.txt) +[![GPL-3.0 Licensed](https://img.shields.io/github/license/dani-garcia/vaultwarden.svg)](https://github.com/dani-garcia/vaultwarden/blob/main/LICENSE.txt) [![Matrix Chat](https://img.shields.io/matrix/vaultwarden:matrix.org.svg?logo=matrix)](https://matrix.to/#/#vaultwarden:matrix.org) Image is based on [Rust implementation of Bitwarden API](https://github.com/dani-garcia/vaultwarden). From 646186fe389dd093fa87099f8a39e865e0a35af3 Mon Sep 17 00:00:00 2001 From: Stefan Melmuk Date: Wed, 12 Oct 2022 20:15:45 +0200 Subject: [PATCH 08/14] fix link of license badge master branch has been renamed to main. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3e25e158..9591bbc9 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ [![Docker Pulls](https://img.shields.io/docker/pulls/vaultwarden/server.svg)](https://hub.docker.com/r/vaultwarden/server) [![Dependency Status](https://deps.rs/repo/github/dani-garcia/vaultwarden/status.svg)](https://deps.rs/repo/github/dani-garcia/vaultwarden) [![GitHub Release](https://img.shields.io/github/release/dani-garcia/vaultwarden.svg)](https://github.com/dani-garcia/vaultwarden/releases/latest) -[![GPL-3.0 Licensed](https://img.shields.io/github/license/dani-garcia/vaultwarden.svg)](https://github.com/dani-garcia/vaultwarden/blob/master/LICENSE.txt) +[![GPL-3.0 Licensed](https://img.shields.io/github/license/dani-garcia/vaultwarden.svg)](https://github.com/dani-garcia/vaultwarden/blob/main/LICENSE.txt) [![Matrix Chat](https://img.shields.io/matrix/vaultwarden:matrix.org.svg?logo=matrix)](https://matrix.to/#/#vaultwarden:matrix.org) Image is based on [Rust implementation of Bitwarden API](https://github.com/dani-garcia/vaultwarden). From b4a38f1f630c3d1d25328ba983f2fa1d47eee921 Mon Sep 17 00:00:00 2001 From: Jeremy Lin Date: Wed, 12 Oct 2022 00:17:09 -0700 Subject: [PATCH 09/14] Add `CreationDate` to cipher response JSON Upstream PR: https://github.com/bitwarden/server/pull/2142 --- src/db/models/cipher.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/db/models/cipher.rs b/src/db/models/cipher.rs index d5f78fbe..7464fdc1 100644 --- a/src/db/models/cipher.rs +++ b/src/db/models/cipher.rs @@ -160,6 +160,7 @@ impl Cipher { "Object": "cipherDetails", "Id": self.uuid, "Type": self.atype, + "CreationDate": format_date(&self.created_at), "RevisionDate": format_date(&self.updated_at), "DeletedDate": self.deleted_at.map_or(Value::Null, |d| Value::String(format_date(&d))), "FolderId": if let Some(cipher_sync_data) = cipher_sync_data { cipher_sync_data.cipher_folders.get(&self.uuid).map(|c| c.to_string() ) } else { self.get_folder_uuid(user_uuid, conn).await }, From 0f944ec7e242c502db5e2f0490ebc27805f39d71 Mon Sep 17 00:00:00 2001 From: Stefan Melmuk Date: Wed, 12 Oct 2022 20:15:45 +0200 Subject: [PATCH 10/14] fix link of license badge master branch has been renamed to main. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3e25e158..9591bbc9 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ [![Docker Pulls](https://img.shields.io/docker/pulls/vaultwarden/server.svg)](https://hub.docker.com/r/vaultwarden/server) [![Dependency Status](https://deps.rs/repo/github/dani-garcia/vaultwarden/status.svg)](https://deps.rs/repo/github/dani-garcia/vaultwarden) [![GitHub Release](https://img.shields.io/github/release/dani-garcia/vaultwarden.svg)](https://github.com/dani-garcia/vaultwarden/releases/latest) -[![GPL-3.0 Licensed](https://img.shields.io/github/license/dani-garcia/vaultwarden.svg)](https://github.com/dani-garcia/vaultwarden/blob/master/LICENSE.txt) +[![GPL-3.0 Licensed](https://img.shields.io/github/license/dani-garcia/vaultwarden.svg)](https://github.com/dani-garcia/vaultwarden/blob/main/LICENSE.txt) [![Matrix Chat](https://img.shields.io/matrix/vaultwarden:matrix.org.svg?logo=matrix)](https://matrix.to/#/#vaultwarden:matrix.org) Image is based on [Rust implementation of Bitwarden API](https://github.com/dani-garcia/vaultwarden). From 1e32db8c416c3c5853d5022c43a35830a1a8518b Mon Sep 17 00:00:00 2001 From: Jeremy Lin Date: Wed, 12 Oct 2022 00:17:09 -0700 Subject: [PATCH 11/14] Add `CreationDate` to cipher response JSON Upstream PR: https://github.com/bitwarden/server/pull/2142 --- src/db/models/cipher.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/db/models/cipher.rs b/src/db/models/cipher.rs index d5f78fbe..7464fdc1 100644 --- a/src/db/models/cipher.rs +++ b/src/db/models/cipher.rs @@ -160,6 +160,7 @@ impl Cipher { "Object": "cipherDetails", "Id": self.uuid, "Type": self.atype, + "CreationDate": format_date(&self.created_at), "RevisionDate": format_date(&self.updated_at), "DeletedDate": self.deleted_at.map_or(Value::Null, |d| Value::String(format_date(&d))), "FolderId": if let Some(cipher_sync_data) = cipher_sync_data { cipher_sync_data.cipher_folders.get(&self.uuid).map(|c| c.to_string() ) } else { self.get_folder_uuid(user_uuid, conn).await }, From 4283a49e0b96da5b9b6dcb2f93cb6c77c0d13c0e Mon Sep 17 00:00:00 2001 From: Jeremy Lin Date: Tue, 11 Oct 2022 21:25:29 -0700 Subject: [PATCH 12/14] Reformat CSP header for readability --- src/util.rs | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/src/util.rs b/src/util.rs index 16c0fce5..dabebd75 100644 --- a/src/util.rs +++ b/src/util.rs @@ -63,16 +63,30 @@ impl Fairing for AppHeaders { // app.simplelogin.io, app.anonaddy.com, api.fastmail.com let csp = format!( "default-src 'self'; \ + object-src 'self' blob:; \ script-src 'self'{script_src}; \ style-src 'self' 'unsafe-inline'; \ - img-src 'self' data: https://haveibeenpwned.com/ https://www.gravatar.com {icon_service_csp}; \ child-src 'self' https://*.duosecurity.com https://*.duofederal.com; \ frame-src 'self' https://*.duosecurity.com https://*.duofederal.com; \ - connect-src 'self' https://api.pwnedpasswords.com/range/ https://2fa.directory/api/ https://app.simplelogin.io/api/ https://app.anonaddy.com/api/ https://api.fastmail.com/; \ - object-src 'self' blob:; \ - frame-ancestors 'self' chrome-extension://nngceckbapebfimnlniiiahkandclblb chrome-extension://jbkfoedolllekgbhcbcoahefnbanhhlh moz-extension://* {allowed_iframe_ancestors};", - icon_service_csp=CONFIG._icon_service_csp(), - allowed_iframe_ancestors=CONFIG.allowed_iframe_ancestors() + frame-ancestors 'self' \ + chrome-extension://nngceckbapebfimnlniiiahkandclblb \ + chrome-extension://jbkfoedolllekgbhcbcoahefnbanhhlh \ + moz-extension://* \ + {allowed_iframe_ancestors}; \ + img-src 'self' data: \ + https://haveibeenpwned.com/ \ + https://www.gravatar.com \ + {icon_service_csp}; \ + connect-src 'self' \ + https://api.pwnedpasswords.com/range/ \ + https://2fa.directory/api/ \ + https://app.simplelogin.io/api/ \ + https://app.anonaddy.com/api/ \ + https://api.fastmail.com/ \ + ;\ + ", + icon_service_csp = CONFIG._icon_service_csp(), + allowed_iframe_ancestors = CONFIG.allowed_iframe_ancestors() ); res.set_raw_header("Content-Security-Policy", csp); res.set_raw_header("X-Frame-Options", "SAMEORIGIN"); From 46ec11de12c70222e814c9ea3f64d87fe0e5f680 Mon Sep 17 00:00:00 2001 From: Jeremy Lin Date: Tue, 11 Oct 2022 21:27:15 -0700 Subject: [PATCH 13/14] Update CSP for DuckDuckGo email forwarding Upstream PR: https://github.com/bitwarden/clients/pull/3630 --- src/util.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/util.rs b/src/util.rs index dabebd75..60e38fef 100644 --- a/src/util.rs +++ b/src/util.rs @@ -60,7 +60,7 @@ impl Fairing for AppHeaders { // Leaked Passwords check: api.pwnedpasswords.com // 2FA/MFA Site check: 2fa.directory // # Mail Relay: https://bitwarden.com/blog/add-privacy-and-security-using-email-aliases-with-bitwarden/ - // app.simplelogin.io, app.anonaddy.com, api.fastmail.com + // app.simplelogin.io, app.anonaddy.com, api.fastmail.com, quack.duckduckgo.com let csp = format!( "default-src 'self'; \ object-src 'self' blob:; \ @@ -83,6 +83,7 @@ impl Fairing for AppHeaders { https://app.simplelogin.io/api/ \ https://app.anonaddy.com/api/ \ https://api.fastmail.com/ \ + https://quack.duckduckgo.com/api/email/ \ ;\ ", icon_service_csp = CONFIG._icon_service_csp(), From 638766b346dc0e00c5db7935d21e48354d632335 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa?= Date: Fri, 14 Oct 2022 18:21:01 +0200 Subject: [PATCH 14/14] Update web-vault to 2022.10.0 and dependencies --- Cargo.lock | 28 +++++++++++++-------------- Cargo.toml | 4 ++-- docker/Dockerfile.j2 | 4 ++-- docker/amd64/Dockerfile | 12 ++++++------ docker/amd64/Dockerfile.alpine | 12 ++++++------ docker/amd64/Dockerfile.buildx | 12 ++++++------ docker/amd64/Dockerfile.buildx.alpine | 12 ++++++------ docker/arm64/Dockerfile | 12 ++++++------ docker/arm64/Dockerfile.alpine | 12 ++++++------ docker/arm64/Dockerfile.buildx | 12 ++++++------ docker/arm64/Dockerfile.buildx.alpine | 12 ++++++------ docker/armv6/Dockerfile | 12 ++++++------ docker/armv6/Dockerfile.alpine | 12 ++++++------ docker/armv6/Dockerfile.buildx | 12 ++++++------ docker/armv6/Dockerfile.buildx.alpine | 12 ++++++------ docker/armv7/Dockerfile | 12 ++++++------ docker/armv7/Dockerfile.alpine | 12 ++++++------ docker/armv7/Dockerfile.buildx | 12 ++++++------ docker/armv7/Dockerfile.buildx.alpine | 12 ++++++------ 19 files changed, 114 insertions(+), 114 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4dbbaf15..cf43dc67 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1361,15 +1361,15 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.134" +version = "0.2.135" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "329c933548736bc49fd575ee68c89e8be4d260064184389a5b77517cddd99ffb" +checksum = "68783febc7782c6c5cb401fbda4de5a9898be1762314da0bb2c10ced61f18b0c" [[package]] name = "libmimalloc-sys" -version = "0.1.25" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11ca136052550448f55df7898c6dbe651c6b574fe38a0d9ea687a9f8088a2e2c" +checksum = "8fc093ab289b0bfda3aa1bdfab9c9542be29c7ef385cfcbe77f8c9813588eb48" dependencies = [ "cc", ] @@ -1502,9 +1502,9 @@ dependencies = [ [[package]] name = "mimalloc" -version = "0.1.29" +version = "0.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f64ad83c969af2e732e907564deb0d0ed393cec4af80776f77dd77a1a427698" +checksum = "76ce6a4b40d3bff9eb3ce9881ca0737a85072f9f975886082640cd46a75cdb35" dependencies = [ "libmimalloc-sys", ] @@ -2144,18 +2144,18 @@ dependencies = [ [[package]] name = "ref-cast" -version = "1.0.9" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed13bcd201494ab44900a96490291651d200730904221832b9547d24a87d332b" +checksum = "12a733f1746c929b4913fe48f8697fcf9c55e3304ba251a79ffb41adfeaf49c2" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.9" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5234cd6063258a5e32903b53b1b6ac043a0541c8adc1f610f67b0326c7a578fa" +checksum = "5887de4a01acafd221861463be6113e6e87275e79804e56779f4cdc131c60368" dependencies = [ "proc-macro2", "quote", @@ -2522,9 +2522,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.85" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44" +checksum = "41feea4228a6f1cd09ec7a3593a682276702cd67b5273544757dae23c096f074" dependencies = [ "itoa", "ryu", @@ -2873,9 +2873,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6edf2d6bc038a43d31353570e27270603f4648d18f5ed10c0e179abe43255af" +checksum = "d660770404473ccd7bc9f8b28494a811bc18542b915c0855c51e8f419d5223ce" dependencies = [ "futures-core", "pin-project-lite", diff --git a/Cargo.toml b/Cargo.toml index f9958821..f2ef16cb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -65,7 +65,7 @@ tokio = { version = "1.21.2", features = ["rt-multi-thread", "fs", "io-util", "p # A generic serialization/deserialization framework serde = { version = "1.0.145", features = ["derive"] } -serde_json = "1.0.85" +serde_json = "1.0.86" # A safe, extensible ORM and Query builder diesel = { version = "1.4.8", features = ["chrono", "r2d2"] } @@ -143,7 +143,7 @@ ctrlc = { version = "3.2.3", features = ["termination"] } # Allow overriding the default memory allocator # Mainly used for the musl builds, since the default musl malloc is very slow -mimalloc = { version = "0.1.29", features = ["secure"], default-features = false, optional = true } +mimalloc = { version = "0.1.30", features = ["secure"], default-features = false, optional = true } [patch.crates-io] # Using a patched version of multer-rs (Used by Rocket) to fix attachment/send file uploads diff --git a/docker/Dockerfile.j2 b/docker/Dockerfile.j2 index e4cd9b7d..b35222a5 100644 --- a/docker/Dockerfile.j2 +++ b/docker/Dockerfile.j2 @@ -59,8 +59,8 @@ # https://docs.docker.com/develop/develop-images/multistage-build/ # https://whitfin.io/speeding-up-rust-docker-builds/ ####################### VAULT BUILD IMAGE ####################### -{% set vault_version = "v2022.9.2" %} -{% set vault_image_digest = "sha256:87b34b7525eba133b7f16b9975917362a3ab9f6466d5264c850816a8fc5e629e" %} +{% set vault_version = "v2022.10.0" %} +{% set vault_image_digest = "sha256:8e8405d252bb6ecc7d59d90e9ba9dde09f35c1b6858371274c67c3e0a6f14a80" %} # The web-vault digest specifies a particular web-vault build on Docker Hub. # Using the digest instead of the tag name provides better security, # as the digest of an image is immutable, whereas a tag name can later diff --git a/docker/amd64/Dockerfile b/docker/amd64/Dockerfile index 0fda2954..9fea427e 100644 --- a/docker/amd64/Dockerfile +++ b/docker/amd64/Dockerfile @@ -16,15 +16,15 @@ # - From https://hub.docker.com/r/vaultwarden/web-vault/tags, # click the tag name to view the digest of the image it currently points to. # - From the command line: -# $ docker pull vaultwarden/web-vault:v2022.9.2 -# $ docker image inspect --format "{{.RepoDigests}}" vaultwarden/web-vault:v2022.9.2 -# [vaultwarden/web-vault@sha256:87b34b7525eba133b7f16b9975917362a3ab9f6466d5264c850816a8fc5e629e] +# $ docker pull vaultwarden/web-vault:v2022.10.0 +# $ docker image inspect --format "{{.RepoDigests}}" vaultwarden/web-vault:v2022.10.0 +# [vaultwarden/web-vault@sha256:8e8405d252bb6ecc7d59d90e9ba9dde09f35c1b6858371274c67c3e0a6f14a80] # # - Conversely, to get the tag name from the digest: -# $ docker image inspect --format "{{.RepoTags}}" vaultwarden/web-vault@sha256:87b34b7525eba133b7f16b9975917362a3ab9f6466d5264c850816a8fc5e629e -# [vaultwarden/web-vault:v2022.9.2] +# $ docker image inspect --format "{{.RepoTags}}" vaultwarden/web-vault@sha256:8e8405d252bb6ecc7d59d90e9ba9dde09f35c1b6858371274c67c3e0a6f14a80 +# [vaultwarden/web-vault:v2022.10.0] # -FROM vaultwarden/web-vault@sha256:87b34b7525eba133b7f16b9975917362a3ab9f6466d5264c850816a8fc5e629e as vault +FROM vaultwarden/web-vault@sha256:8e8405d252bb6ecc7d59d90e9ba9dde09f35c1b6858371274c67c3e0a6f14a80 as vault ########################## BUILD IMAGE ########################## FROM rust:1.64-bullseye as build diff --git a/docker/amd64/Dockerfile.alpine b/docker/amd64/Dockerfile.alpine index 8585e7cb..58394ce7 100644 --- a/docker/amd64/Dockerfile.alpine +++ b/docker/amd64/Dockerfile.alpine @@ -16,15 +16,15 @@ # - From https://hub.docker.com/r/vaultwarden/web-vault/tags, # click the tag name to view the digest of the image it currently points to. # - From the command line: -# $ docker pull vaultwarden/web-vault:v2022.9.2 -# $ docker image inspect --format "{{.RepoDigests}}" vaultwarden/web-vault:v2022.9.2 -# [vaultwarden/web-vault@sha256:87b34b7525eba133b7f16b9975917362a3ab9f6466d5264c850816a8fc5e629e] +# $ docker pull vaultwarden/web-vault:v2022.10.0 +# $ docker image inspect --format "{{.RepoDigests}}" vaultwarden/web-vault:v2022.10.0 +# [vaultwarden/web-vault@sha256:8e8405d252bb6ecc7d59d90e9ba9dde09f35c1b6858371274c67c3e0a6f14a80] # # - Conversely, to get the tag name from the digest: -# $ docker image inspect --format "{{.RepoTags}}" vaultwarden/web-vault@sha256:87b34b7525eba133b7f16b9975917362a3ab9f6466d5264c850816a8fc5e629e -# [vaultwarden/web-vault:v2022.9.2] +# $ docker image inspect --format "{{.RepoTags}}" vaultwarden/web-vault@sha256:8e8405d252bb6ecc7d59d90e9ba9dde09f35c1b6858371274c67c3e0a6f14a80 +# [vaultwarden/web-vault:v2022.10.0] # -FROM vaultwarden/web-vault@sha256:87b34b7525eba133b7f16b9975917362a3ab9f6466d5264c850816a8fc5e629e as vault +FROM vaultwarden/web-vault@sha256:8e8405d252bb6ecc7d59d90e9ba9dde09f35c1b6858371274c67c3e0a6f14a80 as vault ########################## BUILD IMAGE ########################## FROM blackdex/rust-musl:x86_64-musl-stable-1.64.0 as build diff --git a/docker/amd64/Dockerfile.buildx b/docker/amd64/Dockerfile.buildx index ce4116f2..4fa3a268 100644 --- a/docker/amd64/Dockerfile.buildx +++ b/docker/amd64/Dockerfile.buildx @@ -16,15 +16,15 @@ # - From https://hub.docker.com/r/vaultwarden/web-vault/tags, # click the tag name to view the digest of the image it currently points to. # - From the command line: -# $ docker pull vaultwarden/web-vault:v2022.9.2 -# $ docker image inspect --format "{{.RepoDigests}}" vaultwarden/web-vault:v2022.9.2 -# [vaultwarden/web-vault@sha256:87b34b7525eba133b7f16b9975917362a3ab9f6466d5264c850816a8fc5e629e] +# $ docker pull vaultwarden/web-vault:v2022.10.0 +# $ docker image inspect --format "{{.RepoDigests}}" vaultwarden/web-vault:v2022.10.0 +# [vaultwarden/web-vault@sha256:8e8405d252bb6ecc7d59d90e9ba9dde09f35c1b6858371274c67c3e0a6f14a80] # # - Conversely, to get the tag name from the digest: -# $ docker image inspect --format "{{.RepoTags}}" vaultwarden/web-vault@sha256:87b34b7525eba133b7f16b9975917362a3ab9f6466d5264c850816a8fc5e629e -# [vaultwarden/web-vault:v2022.9.2] +# $ docker image inspect --format "{{.RepoTags}}" vaultwarden/web-vault@sha256:8e8405d252bb6ecc7d59d90e9ba9dde09f35c1b6858371274c67c3e0a6f14a80 +# [vaultwarden/web-vault:v2022.10.0] # -FROM vaultwarden/web-vault@sha256:87b34b7525eba133b7f16b9975917362a3ab9f6466d5264c850816a8fc5e629e as vault +FROM vaultwarden/web-vault@sha256:8e8405d252bb6ecc7d59d90e9ba9dde09f35c1b6858371274c67c3e0a6f14a80 as vault ########################## BUILD IMAGE ########################## FROM rust:1.64-bullseye as build diff --git a/docker/amd64/Dockerfile.buildx.alpine b/docker/amd64/Dockerfile.buildx.alpine index d497d8e6..1191f976 100644 --- a/docker/amd64/Dockerfile.buildx.alpine +++ b/docker/amd64/Dockerfile.buildx.alpine @@ -16,15 +16,15 @@ # - From https://hub.docker.com/r/vaultwarden/web-vault/tags, # click the tag name to view the digest of the image it currently points to. # - From the command line: -# $ docker pull vaultwarden/web-vault:v2022.9.2 -# $ docker image inspect --format "{{.RepoDigests}}" vaultwarden/web-vault:v2022.9.2 -# [vaultwarden/web-vault@sha256:87b34b7525eba133b7f16b9975917362a3ab9f6466d5264c850816a8fc5e629e] +# $ docker pull vaultwarden/web-vault:v2022.10.0 +# $ docker image inspect --format "{{.RepoDigests}}" vaultwarden/web-vault:v2022.10.0 +# [vaultwarden/web-vault@sha256:8e8405d252bb6ecc7d59d90e9ba9dde09f35c1b6858371274c67c3e0a6f14a80] # # - Conversely, to get the tag name from the digest: -# $ docker image inspect --format "{{.RepoTags}}" vaultwarden/web-vault@sha256:87b34b7525eba133b7f16b9975917362a3ab9f6466d5264c850816a8fc5e629e -# [vaultwarden/web-vault:v2022.9.2] +# $ docker image inspect --format "{{.RepoTags}}" vaultwarden/web-vault@sha256:8e8405d252bb6ecc7d59d90e9ba9dde09f35c1b6858371274c67c3e0a6f14a80 +# [vaultwarden/web-vault:v2022.10.0] # -FROM vaultwarden/web-vault@sha256:87b34b7525eba133b7f16b9975917362a3ab9f6466d5264c850816a8fc5e629e as vault +FROM vaultwarden/web-vault@sha256:8e8405d252bb6ecc7d59d90e9ba9dde09f35c1b6858371274c67c3e0a6f14a80 as vault ########################## BUILD IMAGE ########################## FROM blackdex/rust-musl:x86_64-musl-stable-1.64.0 as build diff --git a/docker/arm64/Dockerfile b/docker/arm64/Dockerfile index cb804ebe..3bd7455a 100644 --- a/docker/arm64/Dockerfile +++ b/docker/arm64/Dockerfile @@ -16,15 +16,15 @@ # - From https://hub.docker.com/r/vaultwarden/web-vault/tags, # click the tag name to view the digest of the image it currently points to. # - From the command line: -# $ docker pull vaultwarden/web-vault:v2022.9.2 -# $ docker image inspect --format "{{.RepoDigests}}" vaultwarden/web-vault:v2022.9.2 -# [vaultwarden/web-vault@sha256:87b34b7525eba133b7f16b9975917362a3ab9f6466d5264c850816a8fc5e629e] +# $ docker pull vaultwarden/web-vault:v2022.10.0 +# $ docker image inspect --format "{{.RepoDigests}}" vaultwarden/web-vault:v2022.10.0 +# [vaultwarden/web-vault@sha256:8e8405d252bb6ecc7d59d90e9ba9dde09f35c1b6858371274c67c3e0a6f14a80] # # - Conversely, to get the tag name from the digest: -# $ docker image inspect --format "{{.RepoTags}}" vaultwarden/web-vault@sha256:87b34b7525eba133b7f16b9975917362a3ab9f6466d5264c850816a8fc5e629e -# [vaultwarden/web-vault:v2022.9.2] +# $ docker image inspect --format "{{.RepoTags}}" vaultwarden/web-vault@sha256:8e8405d252bb6ecc7d59d90e9ba9dde09f35c1b6858371274c67c3e0a6f14a80 +# [vaultwarden/web-vault:v2022.10.0] # -FROM vaultwarden/web-vault@sha256:87b34b7525eba133b7f16b9975917362a3ab9f6466d5264c850816a8fc5e629e as vault +FROM vaultwarden/web-vault@sha256:8e8405d252bb6ecc7d59d90e9ba9dde09f35c1b6858371274c67c3e0a6f14a80 as vault ########################## BUILD IMAGE ########################## FROM rust:1.64-bullseye as build diff --git a/docker/arm64/Dockerfile.alpine b/docker/arm64/Dockerfile.alpine index 203bfb2f..a89d9eac 100644 --- a/docker/arm64/Dockerfile.alpine +++ b/docker/arm64/Dockerfile.alpine @@ -16,15 +16,15 @@ # - From https://hub.docker.com/r/vaultwarden/web-vault/tags, # click the tag name to view the digest of the image it currently points to. # - From the command line: -# $ docker pull vaultwarden/web-vault:v2022.9.2 -# $ docker image inspect --format "{{.RepoDigests}}" vaultwarden/web-vault:v2022.9.2 -# [vaultwarden/web-vault@sha256:87b34b7525eba133b7f16b9975917362a3ab9f6466d5264c850816a8fc5e629e] +# $ docker pull vaultwarden/web-vault:v2022.10.0 +# $ docker image inspect --format "{{.RepoDigests}}" vaultwarden/web-vault:v2022.10.0 +# [vaultwarden/web-vault@sha256:8e8405d252bb6ecc7d59d90e9ba9dde09f35c1b6858371274c67c3e0a6f14a80] # # - Conversely, to get the tag name from the digest: -# $ docker image inspect --format "{{.RepoTags}}" vaultwarden/web-vault@sha256:87b34b7525eba133b7f16b9975917362a3ab9f6466d5264c850816a8fc5e629e -# [vaultwarden/web-vault:v2022.9.2] +# $ docker image inspect --format "{{.RepoTags}}" vaultwarden/web-vault@sha256:8e8405d252bb6ecc7d59d90e9ba9dde09f35c1b6858371274c67c3e0a6f14a80 +# [vaultwarden/web-vault:v2022.10.0] # -FROM vaultwarden/web-vault@sha256:87b34b7525eba133b7f16b9975917362a3ab9f6466d5264c850816a8fc5e629e as vault +FROM vaultwarden/web-vault@sha256:8e8405d252bb6ecc7d59d90e9ba9dde09f35c1b6858371274c67c3e0a6f14a80 as vault ########################## BUILD IMAGE ########################## FROM blackdex/rust-musl:aarch64-musl-stable-1.64.0 as build diff --git a/docker/arm64/Dockerfile.buildx b/docker/arm64/Dockerfile.buildx index 0b2b3ad6..e4eb70bc 100644 --- a/docker/arm64/Dockerfile.buildx +++ b/docker/arm64/Dockerfile.buildx @@ -16,15 +16,15 @@ # - From https://hub.docker.com/r/vaultwarden/web-vault/tags, # click the tag name to view the digest of the image it currently points to. # - From the command line: -# $ docker pull vaultwarden/web-vault:v2022.9.2 -# $ docker image inspect --format "{{.RepoDigests}}" vaultwarden/web-vault:v2022.9.2 -# [vaultwarden/web-vault@sha256:87b34b7525eba133b7f16b9975917362a3ab9f6466d5264c850816a8fc5e629e] +# $ docker pull vaultwarden/web-vault:v2022.10.0 +# $ docker image inspect --format "{{.RepoDigests}}" vaultwarden/web-vault:v2022.10.0 +# [vaultwarden/web-vault@sha256:8e8405d252bb6ecc7d59d90e9ba9dde09f35c1b6858371274c67c3e0a6f14a80] # # - Conversely, to get the tag name from the digest: -# $ docker image inspect --format "{{.RepoTags}}" vaultwarden/web-vault@sha256:87b34b7525eba133b7f16b9975917362a3ab9f6466d5264c850816a8fc5e629e -# [vaultwarden/web-vault:v2022.9.2] +# $ docker image inspect --format "{{.RepoTags}}" vaultwarden/web-vault@sha256:8e8405d252bb6ecc7d59d90e9ba9dde09f35c1b6858371274c67c3e0a6f14a80 +# [vaultwarden/web-vault:v2022.10.0] # -FROM vaultwarden/web-vault@sha256:87b34b7525eba133b7f16b9975917362a3ab9f6466d5264c850816a8fc5e629e as vault +FROM vaultwarden/web-vault@sha256:8e8405d252bb6ecc7d59d90e9ba9dde09f35c1b6858371274c67c3e0a6f14a80 as vault ########################## BUILD IMAGE ########################## FROM rust:1.64-bullseye as build diff --git a/docker/arm64/Dockerfile.buildx.alpine b/docker/arm64/Dockerfile.buildx.alpine index 32c3d12b..a09f6f33 100644 --- a/docker/arm64/Dockerfile.buildx.alpine +++ b/docker/arm64/Dockerfile.buildx.alpine @@ -16,15 +16,15 @@ # - From https://hub.docker.com/r/vaultwarden/web-vault/tags, # click the tag name to view the digest of the image it currently points to. # - From the command line: -# $ docker pull vaultwarden/web-vault:v2022.9.2 -# $ docker image inspect --format "{{.RepoDigests}}" vaultwarden/web-vault:v2022.9.2 -# [vaultwarden/web-vault@sha256:87b34b7525eba133b7f16b9975917362a3ab9f6466d5264c850816a8fc5e629e] +# $ docker pull vaultwarden/web-vault:v2022.10.0 +# $ docker image inspect --format "{{.RepoDigests}}" vaultwarden/web-vault:v2022.10.0 +# [vaultwarden/web-vault@sha256:8e8405d252bb6ecc7d59d90e9ba9dde09f35c1b6858371274c67c3e0a6f14a80] # # - Conversely, to get the tag name from the digest: -# $ docker image inspect --format "{{.RepoTags}}" vaultwarden/web-vault@sha256:87b34b7525eba133b7f16b9975917362a3ab9f6466d5264c850816a8fc5e629e -# [vaultwarden/web-vault:v2022.9.2] +# $ docker image inspect --format "{{.RepoTags}}" vaultwarden/web-vault@sha256:8e8405d252bb6ecc7d59d90e9ba9dde09f35c1b6858371274c67c3e0a6f14a80 +# [vaultwarden/web-vault:v2022.10.0] # -FROM vaultwarden/web-vault@sha256:87b34b7525eba133b7f16b9975917362a3ab9f6466d5264c850816a8fc5e629e as vault +FROM vaultwarden/web-vault@sha256:8e8405d252bb6ecc7d59d90e9ba9dde09f35c1b6858371274c67c3e0a6f14a80 as vault ########################## BUILD IMAGE ########################## FROM blackdex/rust-musl:aarch64-musl-stable-1.64.0 as build diff --git a/docker/armv6/Dockerfile b/docker/armv6/Dockerfile index b329b925..4ee087d9 100644 --- a/docker/armv6/Dockerfile +++ b/docker/armv6/Dockerfile @@ -16,15 +16,15 @@ # - From https://hub.docker.com/r/vaultwarden/web-vault/tags, # click the tag name to view the digest of the image it currently points to. # - From the command line: -# $ docker pull vaultwarden/web-vault:v2022.9.2 -# $ docker image inspect --format "{{.RepoDigests}}" vaultwarden/web-vault:v2022.9.2 -# [vaultwarden/web-vault@sha256:87b34b7525eba133b7f16b9975917362a3ab9f6466d5264c850816a8fc5e629e] +# $ docker pull vaultwarden/web-vault:v2022.10.0 +# $ docker image inspect --format "{{.RepoDigests}}" vaultwarden/web-vault:v2022.10.0 +# [vaultwarden/web-vault@sha256:8e8405d252bb6ecc7d59d90e9ba9dde09f35c1b6858371274c67c3e0a6f14a80] # # - Conversely, to get the tag name from the digest: -# $ docker image inspect --format "{{.RepoTags}}" vaultwarden/web-vault@sha256:87b34b7525eba133b7f16b9975917362a3ab9f6466d5264c850816a8fc5e629e -# [vaultwarden/web-vault:v2022.9.2] +# $ docker image inspect --format "{{.RepoTags}}" vaultwarden/web-vault@sha256:8e8405d252bb6ecc7d59d90e9ba9dde09f35c1b6858371274c67c3e0a6f14a80 +# [vaultwarden/web-vault:v2022.10.0] # -FROM vaultwarden/web-vault@sha256:87b34b7525eba133b7f16b9975917362a3ab9f6466d5264c850816a8fc5e629e as vault +FROM vaultwarden/web-vault@sha256:8e8405d252bb6ecc7d59d90e9ba9dde09f35c1b6858371274c67c3e0a6f14a80 as vault ########################## BUILD IMAGE ########################## FROM rust:1.64-bullseye as build diff --git a/docker/armv6/Dockerfile.alpine b/docker/armv6/Dockerfile.alpine index 1df53edb..03960a5d 100644 --- a/docker/armv6/Dockerfile.alpine +++ b/docker/armv6/Dockerfile.alpine @@ -16,15 +16,15 @@ # - From https://hub.docker.com/r/vaultwarden/web-vault/tags, # click the tag name to view the digest of the image it currently points to. # - From the command line: -# $ docker pull vaultwarden/web-vault:v2022.9.2 -# $ docker image inspect --format "{{.RepoDigests}}" vaultwarden/web-vault:v2022.9.2 -# [vaultwarden/web-vault@sha256:87b34b7525eba133b7f16b9975917362a3ab9f6466d5264c850816a8fc5e629e] +# $ docker pull vaultwarden/web-vault:v2022.10.0 +# $ docker image inspect --format "{{.RepoDigests}}" vaultwarden/web-vault:v2022.10.0 +# [vaultwarden/web-vault@sha256:8e8405d252bb6ecc7d59d90e9ba9dde09f35c1b6858371274c67c3e0a6f14a80] # # - Conversely, to get the tag name from the digest: -# $ docker image inspect --format "{{.RepoTags}}" vaultwarden/web-vault@sha256:87b34b7525eba133b7f16b9975917362a3ab9f6466d5264c850816a8fc5e629e -# [vaultwarden/web-vault:v2022.9.2] +# $ docker image inspect --format "{{.RepoTags}}" vaultwarden/web-vault@sha256:8e8405d252bb6ecc7d59d90e9ba9dde09f35c1b6858371274c67c3e0a6f14a80 +# [vaultwarden/web-vault:v2022.10.0] # -FROM vaultwarden/web-vault@sha256:87b34b7525eba133b7f16b9975917362a3ab9f6466d5264c850816a8fc5e629e as vault +FROM vaultwarden/web-vault@sha256:8e8405d252bb6ecc7d59d90e9ba9dde09f35c1b6858371274c67c3e0a6f14a80 as vault ########################## BUILD IMAGE ########################## FROM blackdex/rust-musl:arm-musleabi-stable-1.64.0 as build diff --git a/docker/armv6/Dockerfile.buildx b/docker/armv6/Dockerfile.buildx index 41fa992f..7ce39505 100644 --- a/docker/armv6/Dockerfile.buildx +++ b/docker/armv6/Dockerfile.buildx @@ -16,15 +16,15 @@ # - From https://hub.docker.com/r/vaultwarden/web-vault/tags, # click the tag name to view the digest of the image it currently points to. # - From the command line: -# $ docker pull vaultwarden/web-vault:v2022.9.2 -# $ docker image inspect --format "{{.RepoDigests}}" vaultwarden/web-vault:v2022.9.2 -# [vaultwarden/web-vault@sha256:87b34b7525eba133b7f16b9975917362a3ab9f6466d5264c850816a8fc5e629e] +# $ docker pull vaultwarden/web-vault:v2022.10.0 +# $ docker image inspect --format "{{.RepoDigests}}" vaultwarden/web-vault:v2022.10.0 +# [vaultwarden/web-vault@sha256:8e8405d252bb6ecc7d59d90e9ba9dde09f35c1b6858371274c67c3e0a6f14a80] # # - Conversely, to get the tag name from the digest: -# $ docker image inspect --format "{{.RepoTags}}" vaultwarden/web-vault@sha256:87b34b7525eba133b7f16b9975917362a3ab9f6466d5264c850816a8fc5e629e -# [vaultwarden/web-vault:v2022.9.2] +# $ docker image inspect --format "{{.RepoTags}}" vaultwarden/web-vault@sha256:8e8405d252bb6ecc7d59d90e9ba9dde09f35c1b6858371274c67c3e0a6f14a80 +# [vaultwarden/web-vault:v2022.10.0] # -FROM vaultwarden/web-vault@sha256:87b34b7525eba133b7f16b9975917362a3ab9f6466d5264c850816a8fc5e629e as vault +FROM vaultwarden/web-vault@sha256:8e8405d252bb6ecc7d59d90e9ba9dde09f35c1b6858371274c67c3e0a6f14a80 as vault ########################## BUILD IMAGE ########################## FROM rust:1.64-bullseye as build diff --git a/docker/armv6/Dockerfile.buildx.alpine b/docker/armv6/Dockerfile.buildx.alpine index 6cc1efc4..44d8ce5e 100644 --- a/docker/armv6/Dockerfile.buildx.alpine +++ b/docker/armv6/Dockerfile.buildx.alpine @@ -16,15 +16,15 @@ # - From https://hub.docker.com/r/vaultwarden/web-vault/tags, # click the tag name to view the digest of the image it currently points to. # - From the command line: -# $ docker pull vaultwarden/web-vault:v2022.9.2 -# $ docker image inspect --format "{{.RepoDigests}}" vaultwarden/web-vault:v2022.9.2 -# [vaultwarden/web-vault@sha256:87b34b7525eba133b7f16b9975917362a3ab9f6466d5264c850816a8fc5e629e] +# $ docker pull vaultwarden/web-vault:v2022.10.0 +# $ docker image inspect --format "{{.RepoDigests}}" vaultwarden/web-vault:v2022.10.0 +# [vaultwarden/web-vault@sha256:8e8405d252bb6ecc7d59d90e9ba9dde09f35c1b6858371274c67c3e0a6f14a80] # # - Conversely, to get the tag name from the digest: -# $ docker image inspect --format "{{.RepoTags}}" vaultwarden/web-vault@sha256:87b34b7525eba133b7f16b9975917362a3ab9f6466d5264c850816a8fc5e629e -# [vaultwarden/web-vault:v2022.9.2] +# $ docker image inspect --format "{{.RepoTags}}" vaultwarden/web-vault@sha256:8e8405d252bb6ecc7d59d90e9ba9dde09f35c1b6858371274c67c3e0a6f14a80 +# [vaultwarden/web-vault:v2022.10.0] # -FROM vaultwarden/web-vault@sha256:87b34b7525eba133b7f16b9975917362a3ab9f6466d5264c850816a8fc5e629e as vault +FROM vaultwarden/web-vault@sha256:8e8405d252bb6ecc7d59d90e9ba9dde09f35c1b6858371274c67c3e0a6f14a80 as vault ########################## BUILD IMAGE ########################## FROM blackdex/rust-musl:arm-musleabi-stable-1.64.0 as build diff --git a/docker/armv7/Dockerfile b/docker/armv7/Dockerfile index 69d2161a..caa8c7d9 100644 --- a/docker/armv7/Dockerfile +++ b/docker/armv7/Dockerfile @@ -16,15 +16,15 @@ # - From https://hub.docker.com/r/vaultwarden/web-vault/tags, # click the tag name to view the digest of the image it currently points to. # - From the command line: -# $ docker pull vaultwarden/web-vault:v2022.9.2 -# $ docker image inspect --format "{{.RepoDigests}}" vaultwarden/web-vault:v2022.9.2 -# [vaultwarden/web-vault@sha256:87b34b7525eba133b7f16b9975917362a3ab9f6466d5264c850816a8fc5e629e] +# $ docker pull vaultwarden/web-vault:v2022.10.0 +# $ docker image inspect --format "{{.RepoDigests}}" vaultwarden/web-vault:v2022.10.0 +# [vaultwarden/web-vault@sha256:8e8405d252bb6ecc7d59d90e9ba9dde09f35c1b6858371274c67c3e0a6f14a80] # # - Conversely, to get the tag name from the digest: -# $ docker image inspect --format "{{.RepoTags}}" vaultwarden/web-vault@sha256:87b34b7525eba133b7f16b9975917362a3ab9f6466d5264c850816a8fc5e629e -# [vaultwarden/web-vault:v2022.9.2] +# $ docker image inspect --format "{{.RepoTags}}" vaultwarden/web-vault@sha256:8e8405d252bb6ecc7d59d90e9ba9dde09f35c1b6858371274c67c3e0a6f14a80 +# [vaultwarden/web-vault:v2022.10.0] # -FROM vaultwarden/web-vault@sha256:87b34b7525eba133b7f16b9975917362a3ab9f6466d5264c850816a8fc5e629e as vault +FROM vaultwarden/web-vault@sha256:8e8405d252bb6ecc7d59d90e9ba9dde09f35c1b6858371274c67c3e0a6f14a80 as vault ########################## BUILD IMAGE ########################## FROM rust:1.64-bullseye as build diff --git a/docker/armv7/Dockerfile.alpine b/docker/armv7/Dockerfile.alpine index 260ca7c9..9640508e 100644 --- a/docker/armv7/Dockerfile.alpine +++ b/docker/armv7/Dockerfile.alpine @@ -16,15 +16,15 @@ # - From https://hub.docker.com/r/vaultwarden/web-vault/tags, # click the tag name to view the digest of the image it currently points to. # - From the command line: -# $ docker pull vaultwarden/web-vault:v2022.9.2 -# $ docker image inspect --format "{{.RepoDigests}}" vaultwarden/web-vault:v2022.9.2 -# [vaultwarden/web-vault@sha256:87b34b7525eba133b7f16b9975917362a3ab9f6466d5264c850816a8fc5e629e] +# $ docker pull vaultwarden/web-vault:v2022.10.0 +# $ docker image inspect --format "{{.RepoDigests}}" vaultwarden/web-vault:v2022.10.0 +# [vaultwarden/web-vault@sha256:8e8405d252bb6ecc7d59d90e9ba9dde09f35c1b6858371274c67c3e0a6f14a80] # # - Conversely, to get the tag name from the digest: -# $ docker image inspect --format "{{.RepoTags}}" vaultwarden/web-vault@sha256:87b34b7525eba133b7f16b9975917362a3ab9f6466d5264c850816a8fc5e629e -# [vaultwarden/web-vault:v2022.9.2] +# $ docker image inspect --format "{{.RepoTags}}" vaultwarden/web-vault@sha256:8e8405d252bb6ecc7d59d90e9ba9dde09f35c1b6858371274c67c3e0a6f14a80 +# [vaultwarden/web-vault:v2022.10.0] # -FROM vaultwarden/web-vault@sha256:87b34b7525eba133b7f16b9975917362a3ab9f6466d5264c850816a8fc5e629e as vault +FROM vaultwarden/web-vault@sha256:8e8405d252bb6ecc7d59d90e9ba9dde09f35c1b6858371274c67c3e0a6f14a80 as vault ########################## BUILD IMAGE ########################## FROM blackdex/rust-musl:armv7-musleabihf-stable-1.64.0 as build diff --git a/docker/armv7/Dockerfile.buildx b/docker/armv7/Dockerfile.buildx index 05956095..5a41e7ef 100644 --- a/docker/armv7/Dockerfile.buildx +++ b/docker/armv7/Dockerfile.buildx @@ -16,15 +16,15 @@ # - From https://hub.docker.com/r/vaultwarden/web-vault/tags, # click the tag name to view the digest of the image it currently points to. # - From the command line: -# $ docker pull vaultwarden/web-vault:v2022.9.2 -# $ docker image inspect --format "{{.RepoDigests}}" vaultwarden/web-vault:v2022.9.2 -# [vaultwarden/web-vault@sha256:87b34b7525eba133b7f16b9975917362a3ab9f6466d5264c850816a8fc5e629e] +# $ docker pull vaultwarden/web-vault:v2022.10.0 +# $ docker image inspect --format "{{.RepoDigests}}" vaultwarden/web-vault:v2022.10.0 +# [vaultwarden/web-vault@sha256:8e8405d252bb6ecc7d59d90e9ba9dde09f35c1b6858371274c67c3e0a6f14a80] # # - Conversely, to get the tag name from the digest: -# $ docker image inspect --format "{{.RepoTags}}" vaultwarden/web-vault@sha256:87b34b7525eba133b7f16b9975917362a3ab9f6466d5264c850816a8fc5e629e -# [vaultwarden/web-vault:v2022.9.2] +# $ docker image inspect --format "{{.RepoTags}}" vaultwarden/web-vault@sha256:8e8405d252bb6ecc7d59d90e9ba9dde09f35c1b6858371274c67c3e0a6f14a80 +# [vaultwarden/web-vault:v2022.10.0] # -FROM vaultwarden/web-vault@sha256:87b34b7525eba133b7f16b9975917362a3ab9f6466d5264c850816a8fc5e629e as vault +FROM vaultwarden/web-vault@sha256:8e8405d252bb6ecc7d59d90e9ba9dde09f35c1b6858371274c67c3e0a6f14a80 as vault ########################## BUILD IMAGE ########################## FROM rust:1.64-bullseye as build diff --git a/docker/armv7/Dockerfile.buildx.alpine b/docker/armv7/Dockerfile.buildx.alpine index 24270bbf..e35dd2b8 100644 --- a/docker/armv7/Dockerfile.buildx.alpine +++ b/docker/armv7/Dockerfile.buildx.alpine @@ -16,15 +16,15 @@ # - From https://hub.docker.com/r/vaultwarden/web-vault/tags, # click the tag name to view the digest of the image it currently points to. # - From the command line: -# $ docker pull vaultwarden/web-vault:v2022.9.2 -# $ docker image inspect --format "{{.RepoDigests}}" vaultwarden/web-vault:v2022.9.2 -# [vaultwarden/web-vault@sha256:87b34b7525eba133b7f16b9975917362a3ab9f6466d5264c850816a8fc5e629e] +# $ docker pull vaultwarden/web-vault:v2022.10.0 +# $ docker image inspect --format "{{.RepoDigests}}" vaultwarden/web-vault:v2022.10.0 +# [vaultwarden/web-vault@sha256:8e8405d252bb6ecc7d59d90e9ba9dde09f35c1b6858371274c67c3e0a6f14a80] # # - Conversely, to get the tag name from the digest: -# $ docker image inspect --format "{{.RepoTags}}" vaultwarden/web-vault@sha256:87b34b7525eba133b7f16b9975917362a3ab9f6466d5264c850816a8fc5e629e -# [vaultwarden/web-vault:v2022.9.2] +# $ docker image inspect --format "{{.RepoTags}}" vaultwarden/web-vault@sha256:8e8405d252bb6ecc7d59d90e9ba9dde09f35c1b6858371274c67c3e0a6f14a80 +# [vaultwarden/web-vault:v2022.10.0] # -FROM vaultwarden/web-vault@sha256:87b34b7525eba133b7f16b9975917362a3ab9f6466d5264c850816a8fc5e629e as vault +FROM vaultwarden/web-vault@sha256:8e8405d252bb6ecc7d59d90e9ba9dde09f35c1b6858371274c67c3e0a6f14a80 as vault ########################## BUILD IMAGE ########################## FROM blackdex/rust-musl:armv7-musleabihf-stable-1.64.0 as build