commit ab4355cfedb49cc67bf17f0332138253ad69c5a4
parent 948dc82228243a03cd391ca028851a890b331bdd
Author: Daniel García <dani-garcia@users.noreply.github.com>
Date: Sat, 3 Oct 2020 20:14:17 +0200
Updated web vault, dependencies and base docker images
Diffstat:
9 files changed, 120 insertions(+), 111 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
@@ -64,9 +64,9 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
[[package]]
name = "backtrace"
-version = "0.3.50"
+version = "0.3.51"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46254cf2fdcdf1badb5934448c1bcbe046a56537b3987d96c51a7afc5d03f293"
+checksum = "ec1931848a574faa8f7c71a12ea00453ff5effbb5f51afe7f77d7a48cace6ac1"
dependencies = [
"addr2line",
"cfg-if",
@@ -167,7 +167,7 @@ dependencies = [
"soup",
"structopt",
"syslog",
- "time 0.2.20",
+ "time 0.2.22",
"u2f",
"uuid",
"ws",
@@ -269,13 +269,15 @@ dependencies = [
[[package]]
name = "chrono"
-version = "0.4.15"
+version = "0.4.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942f72db697d8767c22d46a598e01f2d3b475501ea43d0db4f16d90259182d0b"
+checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73"
dependencies = [
+ "libc",
"num-integer",
"num-traits",
"time 0.1.44",
+ "winapi 0.3.9",
]
[[package]]
@@ -340,7 +342,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c60ef6d0bbf56ad2674249b6bb74f2c6aeb98b98dd57b5d3e37cace33011d69"
dependencies = [
"percent-encoding 2.1.0",
- "time 0.2.20",
+ "time 0.2.22",
]
[[package]]
@@ -417,9 +419,9 @@ version = "0.3.0"
source = "git+https://github.com/SergioBenitez/Devise.git?rev=e58b3ac9a#e58b3ac9afc3b6ff10a8aaf02a3e768a8f530089"
dependencies = [
"bitflags",
- "proc-macro2 1.0.21",
+ "proc-macro2 1.0.24",
"quote 1.0.7",
- "syn 1.0.41",
+ "syn 1.0.42",
]
[[package]]
@@ -445,9 +447,9 @@ version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "45f5098f628d02a7a0f68ddba586fb61e80edec3bdc1be3b921f4ceec60858d3"
dependencies = [
- "proc-macro2 1.0.21",
+ "proc-macro2 1.0.24",
"quote 1.0.7",
- "syn 1.0.41",
+ "syn 1.0.42",
]
[[package]]
@@ -679,9 +681,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d0b5a30a4328ab5473878237c447333c093297bded83a4983d10f4deea240d39"
dependencies = [
"proc-macro-hack",
- "proc-macro2 1.0.21",
+ "proc-macro2 1.0.24",
"quote 1.0.7",
- "syn 1.0.41",
+ "syn 1.0.42",
]
[[package]]
@@ -782,9 +784,9 @@ dependencies = [
[[package]]
name = "handlebars"
-version = "3.4.0"
+version = "3.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5deefd4816fb852b1ff3cb48f6c41da67be2d0e1d20b26a7a3b076da11f064b1"
+checksum = "dcd1b5399b9884f9ae18b5d4105d180720c8f602aeb73d3ceae9d6b1d13a5fa7"
dependencies = [
"log 0.4.11",
"pest",
@@ -797,9 +799,9 @@ dependencies = [
[[package]]
name = "hashbrown"
-version = "0.9.0"
+version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00d63df3d41950fb462ed38308eea019113ad1508da725bbedcd0fa5a85ef5f7"
+checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"
[[package]]
name = "heck"
@@ -812,9 +814,9 @@ dependencies = [
[[package]]
name = "hermit-abi"
-version = "0.1.15"
+version = "0.1.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9"
+checksum = "4c30f6d0bc6b00693347368a67d41b58f2fb851215ff1da49e90fe2c5c667151"
dependencies = [
"libc",
]
@@ -1153,9 +1155,9 @@ dependencies = [
[[package]]
name = "libc"
-version = "0.2.77"
+version = "0.2.78"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2f96b10ec2560088a8e76961b00d47107b3a625fecb76dedb29ee7ccbf98235"
+checksum = "aa7087f49d294270db4e1928fc110c976cd4b9e5a16348e0a1df09afa99e6c98"
[[package]]
name = "libsqlite3-sys"
@@ -1263,9 +1265,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9753f12909fd8d923f75ae5c3258cae1ed3c8ec052e1b38c93c21a6d157f789c"
dependencies = [
"migrations_internals",
- "proc-macro2 1.0.21",
+ "proc-macro2 1.0.24",
"quote 1.0.7",
- "syn 1.0.41",
+ "syn 1.0.42",
]
[[package]]
@@ -1467,9 +1469,9 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6f09b9841adb6b5e1f89ef7087ea636e0fd94b2851f887c1e3eb5d5f8228fab3"
dependencies = [
- "proc-macro2 1.0.21",
+ "proc-macro2 1.0.24",
"quote 1.0.7",
- "syn 1.0.41",
+ "syn 1.0.42",
]
[[package]]
@@ -1719,9 +1721,9 @@ checksum = "99b8db626e31e5b81787b9783425769681b347011cc59471e33ea46d2ea0cf55"
dependencies = [
"pest",
"pest_meta",
- "proc-macro2 1.0.21",
+ "proc-macro2 1.0.24",
"quote 1.0.7",
- "syn 1.0.41",
+ "syn 1.0.42",
]
[[package]]
@@ -1775,29 +1777,29 @@ dependencies = [
[[package]]
name = "pin-project"
-version = "0.4.23"
+version = "0.4.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca4433fff2ae79342e497d9f8ee990d174071408f28f726d6d83af93e58e48aa"
+checksum = "2b9e280448854bd91559252582173b3bd1f8e094a0e644791c0628ca9b1f144f"
dependencies = [
"pin-project-internal",
]
[[package]]
name = "pin-project-internal"
-version = "0.4.23"
+version = "0.4.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c0e815c3ee9a031fdf5af21c10aa17c573c9c6a566328d99e3936c34e36461f"
+checksum = "c8c8b352676bc6a4c3d71970560b913cea444a7a921cc2e2d920225e4b91edaa"
dependencies = [
- "proc-macro2 1.0.21",
+ "proc-macro2 1.0.24",
"quote 1.0.7",
- "syn 1.0.41",
+ "syn 1.0.42",
]
[[package]]
name = "pin-project-lite"
-version = "0.1.7"
+version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "282adbf10f2698a7a77f8e983a74b2d18176c19a7fd32a45446139ae7b02b715"
+checksum = "e555d9e657502182ac97b539fb3dae8b79cda19e3e4f8ffb5e8de4f18df93c95"
[[package]]
name = "pin-utils"
@@ -1839,9 +1841,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
dependencies = [
"proc-macro-error-attr",
- "proc-macro2 1.0.21",
+ "proc-macro2 1.0.24",
"quote 1.0.7",
- "syn 1.0.41",
+ "syn 1.0.42",
"version_check 0.9.2",
]
@@ -1851,7 +1853,7 @@ version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
dependencies = [
- "proc-macro2 1.0.21",
+ "proc-macro2 1.0.24",
"quote 1.0.7",
"version_check 0.9.2",
]
@@ -1879,9 +1881,9 @@ dependencies = [
[[package]]
name = "proc-macro2"
-version = "1.0.21"
+version = "1.0.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36e28516df94f3dd551a587da5357459d9b36d945a7c37c3557928c1c2ff2a2c"
+checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
dependencies = [
"unicode-xid 0.2.1",
]
@@ -1913,7 +1915,7 @@ version = "1.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37"
dependencies = [
- "proc-macro2 1.0.21",
+ "proc-macro2 1.0.24",
]
[[package]]
@@ -2220,7 +2222,7 @@ dependencies = [
"rocket_codegen",
"rocket_http",
"state",
- "time 0.2.20",
+ "time 0.2.22",
"toml",
"version_check 0.9.2",
"yansi",
@@ -2266,7 +2268,7 @@ dependencies = [
"rustls",
"smallvec 1.4.2",
"state",
- "time 0.2.20",
+ "time 0.2.22",
"unicode-xid 0.2.1",
]
@@ -2413,16 +2415,16 @@ version = "1.0.116"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f630a6370fd8e457873b4bd2ffdae75408bc291ba72be773772a4c2a065d9ae8"
dependencies = [
- "proc-macro2 1.0.21",
+ "proc-macro2 1.0.24",
"quote 1.0.7",
- "syn 1.0.41",
+ "syn 1.0.42",
]
[[package]]
name = "serde_json"
-version = "1.0.57"
+version = "1.0.58"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "164eacbdb13512ec2745fb09d51fd5b22b0d65ed294a1dcf7285a360c80a675c"
+checksum = "a230ea9107ca2220eea9d46de97eddcb04cd00e92d13dda78e478dd33fa82bd4"
dependencies = [
"itoa",
"ryu",
@@ -2598,11 +2600,11 @@ version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef"
dependencies = [
- "proc-macro2 1.0.21",
+ "proc-macro2 1.0.24",
"quote 1.0.7",
"serde",
"serde_derive",
- "syn 1.0.41",
+ "syn 1.0.42",
]
[[package]]
@@ -2612,13 +2614,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11"
dependencies = [
"base-x",
- "proc-macro2 1.0.21",
+ "proc-macro2 1.0.24",
"quote 1.0.7",
"serde",
"serde_derive",
"serde_json",
"sha1",
- "syn 1.0.41",
+ "syn 1.0.42",
]
[[package]]
@@ -2650,7 +2652,7 @@ checksum = "f0f45ed1b65bf9a4bf2f7b7dc59212d1926e9eaf00fa998988e420fd124467c6"
dependencies = [
"phf_generator",
"phf_shared",
- "proc-macro2 1.0.21",
+ "proc-macro2 1.0.24",
"quote 1.0.7",
"string_cache_shared",
]
@@ -2669,9 +2671,9 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
[[package]]
name = "structopt"
-version = "0.3.17"
+version = "0.3.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6cc388d94ffabf39b5ed5fadddc40147cb21e605f53db6f8f36a625d27489ac5"
+checksum = "a33f6461027d7f08a13715659b2948e1602c31a3756aeae9378bfe7518c72e82"
dependencies = [
"clap",
"lazy_static",
@@ -2680,15 +2682,15 @@ dependencies = [
[[package]]
name = "structopt-derive"
-version = "0.4.10"
+version = "0.4.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e2513111825077552a6751dfad9e11ce0fba07d7276a3943a037d7e93e64c5f"
+checksum = "c92e775028122a4b3dd55d58f14fc5120289c69bee99df1d117ae30f84b225c9"
dependencies = [
"heck",
"proc-macro-error",
- "proc-macro2 1.0.21",
+ "proc-macro2 1.0.24",
"quote 1.0.7",
- "syn 1.0.41",
+ "syn 1.0.42",
]
[[package]]
@@ -2716,11 +2718,11 @@ dependencies = [
[[package]]
name = "syn"
-version = "1.0.41"
+version = "1.0.42"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6690e3e9f692504b941dc6c3b188fd28df054f7fb8469ab40680df52fdcc842b"
+checksum = "9c51d92969d209b54a98397e1b91c8ae82d8c87a7bb87df0b29aa2ad81454228"
dependencies = [
- "proc-macro2 1.0.21",
+ "proc-macro2 1.0.24",
"quote 1.0.7",
"unicode-xid 0.2.1",
]
@@ -2802,9 +2804,9 @@ dependencies = [
[[package]]
name = "time"
-version = "0.2.20"
+version = "0.2.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d4953c513c9bf1b97e9cdd83f11d60c4b0a83462880a360d80d96953a953fee"
+checksum = "55b7151c9065e80917fbf285d9a5d1432f60db41d170ccafc749a136b41a93af"
dependencies = [
"const_fn",
"libc",
@@ -2817,9 +2819,9 @@ dependencies = [
[[package]]
name = "time-macros"
-version = "0.1.0"
+version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ae9b6e9f095bc105e183e3cd493d72579be3181ad4004fceb01adbe9eecab2d"
+checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1"
dependencies = [
"proc-macro-hack",
"time-macros-impl",
@@ -2832,10 +2834,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e5c3be1edfad6027c69f5491cf4cb310d1a71ecd6af742788c6ff8bced86b8fa"
dependencies = [
"proc-macro-hack",
- "proc-macro2 1.0.21",
+ "proc-macro2 1.0.24",
"quote 1.0.7",
"standback",
- "syn 1.0.41",
+ "syn 1.0.42",
]
[[package]]
@@ -2903,20 +2905,21 @@ checksum = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860"
[[package]]
name = "tracing"
-version = "0.1.19"
+version = "0.1.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d79ca061b032d6ce30c660fded31189ca0b9922bf483cd70759f13a2d86786c"
+checksum = "b0987850db3733619253fe60e17cb59b82d37c7e6c0236bb81e4d6b87c879f27"
dependencies = [
"cfg-if",
"log 0.4.11",
+ "pin-project-lite",
"tracing-core",
]
[[package]]
name = "tracing-core"
-version = "0.1.16"
+version = "0.1.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bcf46c1f1f06aeea2d6b81f3c863d0930a596c86ad1920d4e5bad6dd1d7119a"
+checksum = "f50de3927f93d202783f4513cda820ab47ef17f624b03c096e86ef00c67e6b5f"
dependencies = [
"lazy_static",
]
@@ -3158,9 +3161,9 @@ dependencies = [
"bumpalo",
"lazy_static",
"log 0.4.11",
- "proc-macro2 1.0.21",
+ "proc-macro2 1.0.24",
"quote 1.0.7",
- "syn 1.0.41",
+ "syn 1.0.42",
"wasm-bindgen-shared",
]
@@ -3192,9 +3195,9 @@ version = "0.2.68"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f249f06ef7ee334cc3b8ff031bfc11ec99d00f34d86da7498396dc1e3b1498fe"
dependencies = [
- "proc-macro2 1.0.21",
+ "proc-macro2 1.0.24",
"quote 1.0.7",
- "syn 1.0.41",
+ "syn 1.0.42",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
diff --git a/Cargo.toml b/Cargo.toml
@@ -47,8 +47,8 @@ rmpv = "0.4.5"
chashmap = "2.2.2"
# A generic serialization/deserialization framework
-serde = "1.0.116"
-serde_derive = "1.0.116"
+serde = "1.0.115"
+serde_derive = "1.0.115"
serde_json = "1.0.57"
# Logging
diff --git a/docker/Dockerfile.j2 b/docker/Dockerfile.j2
@@ -1,10 +1,10 @@
# This file was generated using a Jinja2 template.
# Please make your changes in `Dockerfile.j2` and then `make` the individual Dockerfile's.
-{% set build_stage_base_image = "rust:1.45" %}
+{% set build_stage_base_image = "rust:1.46" %}
{% if "alpine" in target_file %}
{% if "amd64" in target_file %}
-{% set build_stage_base_image = "clux/muslrust:nightly-2020-07-09" %}
+{% set build_stage_base_image = "clux/muslrust:nightly-2020-10-02" %}
{% set runtime_stage_base_image = "alpine:3.12" %}
{% set package_arch_name = "" %}
{% elif "arm32v7" in target_file %}
@@ -33,17 +33,17 @@
# https://docs.docker.com/develop/develop-images/multistage-build/
# https://whitfin.io/speeding-up-rust-docker-builds/
####################### VAULT BUILD IMAGE #######################
-{% set vault_image_hash = "sha256:a6705a4d7776500a6544afd141de1786e6b87c386b068be996294960779cb5bf" %}
+{% set vault_image_hash = "sha256:e40228f94cead5e50af6575fb39850a002dad146dab6836e5da5663e6d214303" %}
{% raw %}
# This hash is extracted from the docker web-vault builds and it's prefered over a simple tag because it's immutable.
# It can be viewed in multiple ways:
# - From the https://hub.docker.com/repository/docker/bitwardenrs/web-vault/tags page, click the tag name and the digest should be there.
# - From the console, with the following commands:
# docker pull bitwardenrs/web-vault:v2.16.0b
-# docker image inspect --format "{{.RepoDigests}}" bitwardenrs/web-vault:v2.16.0b
+# docker image inspect --format "{{.RepoDigests}}" bitwardenrs/web-vault:v2.16.1
#
# - To do the opposite, and get the tag from the hash, you can do:
-# docker image inspect --format "{{.RepoTags}}" bitwardenrs/web-vault@sha256:a6705a4d7776500a6544afd141de1786e6b87c386b068be996294960779cb5bf
+# docker image inspect --format "{{.RepoTags}}" bitwardenrs/web-vault@sha256:e40228f94cead5e50af6575fb39850a002dad146dab6836e5da5663e6d214303
{% endraw %}
FROM bitwardenrs/web-vault@{{ vault_image_hash }} as vault
diff --git a/docker/amd64/Dockerfile b/docker/amd64/Dockerfile
@@ -10,15 +10,15 @@
# It can be viewed in multiple ways:
# - From the https://hub.docker.com/repository/docker/bitwardenrs/web-vault/tags page, click the tag name and the digest should be there.
# - From the console, with the following commands:
-# docker pull bitwardenrs/web-vault:v2.15.1
-# docker image inspect --format "{{.RepoDigests}}" bitwardenrs/web-vault:v2.15.1
+# docker pull bitwardenrs/web-vault:v2.16.0b
+# docker image inspect --format "{{.RepoDigests}}" bitwardenrs/web-vault:v2.16.1
#
# - To do the opposite, and get the tag from the hash, you can do:
-# docker image inspect --format "{{.RepoTags}}" bitwardenrs/web-vault@sha256:afba1e3bded09dc0a6a0dbacb3363ac33b6f122b4b26d3682cafb9115bdf785c
-FROM bitwardenrs/web-vault@sha256:3581afd49201ea11edc5372ee3ffd8945f005602d9adc0300dcc7ef6860f232c as vault
+# docker image inspect --format "{{.RepoTags}}" bitwardenrs/web-vault@sha256:e40228f94cead5e50af6575fb39850a002dad146dab6836e5da5663e6d214303
+FROM bitwardenrs/web-vault@sha256:e40228f94cead5e50af6575fb39850a002dad146dab6836e5da5663e6d214303 as vault
########################## BUILD IMAGE ##########################
-FROM rust:1.45 as build
+FROM rust:1.46 as build
# AMD64 supports all
ARG DB=sqlite,mysql,postgresql
@@ -45,6 +45,7 @@ COPY ./Cargo.* ./
COPY ./rust-toolchain ./rust-toolchain
COPY ./build.rs ./build.rs
+
# Builds your dependencies and removes the
# dummy project, except the target folder
# This folder contains the compiled dependencies
@@ -101,3 +102,4 @@ HEALTHCHECK --interval=60s --timeout=10s CMD ["/healthcheck.sh"]
# Configures the startup!
WORKDIR /
CMD ["/start.sh"]
+
diff --git a/docker/amd64/Dockerfile.alpine b/docker/amd64/Dockerfile.alpine
@@ -10,15 +10,15 @@
# It can be viewed in multiple ways:
# - From the https://hub.docker.com/repository/docker/bitwardenrs/web-vault/tags page, click the tag name and the digest should be there.
# - From the console, with the following commands:
-# docker pull bitwardenrs/web-vault:v2.15.1
-# docker image inspect --format "{{.RepoDigests}}" bitwardenrs/web-vault:v2.15.1
+# docker pull bitwardenrs/web-vault:v2.16.0b
+# docker image inspect --format "{{.RepoDigests}}" bitwardenrs/web-vault:v2.16.1
#
# - To do the opposite, and get the tag from the hash, you can do:
-# docker image inspect --format "{{.RepoTags}}" bitwardenrs/web-vault@sha256:afba1e3bded09dc0a6a0dbacb3363ac33b6f122b4b26d3682cafb9115bdf785c
-FROM bitwardenrs/web-vault@sha256:3581afd49201ea11edc5372ee3ffd8945f005602d9adc0300dcc7ef6860f232c as vault
+# docker image inspect --format "{{.RepoTags}}" bitwardenrs/web-vault@sha256:e40228f94cead5e50af6575fb39850a002dad146dab6836e5da5663e6d214303
+FROM bitwardenrs/web-vault@sha256:e40228f94cead5e50af6575fb39850a002dad146dab6836e5da5663e6d214303 as vault
########################## BUILD IMAGE ##########################
-FROM clux/muslrust:nightly-2020-07-09 as build
+FROM clux/muslrust:nightly-2020-10-02 as build
# Alpine only works on SQlite
ARG DB=sqlite
@@ -59,7 +59,7 @@ RUN touch src/main.rs
# Builds again, this time it'll just be
# your actual source files being built
-RUN cargo build --features ${DB} --release
+RUN cargo build --features ${DB} --release --target=x86_64-unknown-linux-musl
######################## RUNTIME IMAGE ########################
# Create a new stage with a minimal image
@@ -96,3 +96,4 @@ HEALTHCHECK --interval=60s --timeout=10s CMD ["/healthcheck.sh"]
# Configures the startup!
WORKDIR /
CMD ["/start.sh"]
+
diff --git a/docker/arm32v6/Dockerfile b/docker/arm32v6/Dockerfile
@@ -10,15 +10,15 @@
# It can be viewed in multiple ways:
# - From the https://hub.docker.com/repository/docker/bitwardenrs/web-vault/tags page, click the tag name and the digest should be there.
# - From the console, with the following commands:
-# docker pull bitwardenrs/web-vault:v2.15.1
-# docker image inspect --format "{{.RepoDigests}}" bitwardenrs/web-vault:v2.15.1
+# docker pull bitwardenrs/web-vault:v2.16.0b
+# docker image inspect --format "{{.RepoDigests}}" bitwardenrs/web-vault:v2.16.1
#
# - To do the opposite, and get the tag from the hash, you can do:
-# docker image inspect --format "{{.RepoTags}}" bitwardenrs/web-vault@sha256:afba1e3bded09dc0a6a0dbacb3363ac33b6f122b4b26d3682cafb9115bdf785c
-FROM bitwardenrs/web-vault@sha256:3581afd49201ea11edc5372ee3ffd8945f005602d9adc0300dcc7ef6860f232c as vault
+# docker image inspect --format "{{.RepoTags}}" bitwardenrs/web-vault@sha256:e40228f94cead5e50af6575fb39850a002dad146dab6836e5da5663e6d214303
+FROM bitwardenrs/web-vault@sha256:e40228f94cead5e50af6575fb39850a002dad146dab6836e5da5663e6d214303 as vault
########################## BUILD IMAGE ##########################
-FROM rust:1.45 as build
+FROM rust:1.46 as build
# ARM only supports SQLite for now
ARG DB=sqlite
@@ -124,3 +124,4 @@ HEALTHCHECK --interval=60s --timeout=10s CMD ["/healthcheck.sh"]
# Configures the startup!
WORKDIR /
CMD ["/start.sh"]
+
diff --git a/docker/arm32v7/Dockerfile b/docker/arm32v7/Dockerfile
@@ -10,15 +10,15 @@
# It can be viewed in multiple ways:
# - From the https://hub.docker.com/repository/docker/bitwardenrs/web-vault/tags page, click the tag name and the digest should be there.
# - From the console, with the following commands:
-# docker pull bitwardenrs/web-vault:v2.15.1
-# docker image inspect --format "{{.RepoDigests}}" bitwardenrs/web-vault:v2.15.1
+# docker pull bitwardenrs/web-vault:v2.16.0b
+# docker image inspect --format "{{.RepoDigests}}" bitwardenrs/web-vault:v2.16.1
#
# - To do the opposite, and get the tag from the hash, you can do:
-# docker image inspect --format "{{.RepoTags}}" bitwardenrs/web-vault@sha256:afba1e3bded09dc0a6a0dbacb3363ac33b6f122b4b26d3682cafb9115bdf785c
-FROM bitwardenrs/web-vault@sha256:3581afd49201ea11edc5372ee3ffd8945f005602d9adc0300dcc7ef6860f232c as vault
+# docker image inspect --format "{{.RepoTags}}" bitwardenrs/web-vault@sha256:e40228f94cead5e50af6575fb39850a002dad146dab6836e5da5663e6d214303
+FROM bitwardenrs/web-vault@sha256:e40228f94cead5e50af6575fb39850a002dad146dab6836e5da5663e6d214303 as vault
########################## BUILD IMAGE ##########################
-FROM rust:1.45 as build
+FROM rust:1.46 as build
# ARM only supports SQLite for now
ARG DB=sqlite
@@ -124,3 +124,4 @@ HEALTHCHECK --interval=60s --timeout=10s CMD ["/healthcheck.sh"]
# Configures the startup!
WORKDIR /
CMD ["/start.sh"]
+
diff --git a/docker/arm32v7/Dockerfile.alpine b/docker/arm32v7/Dockerfile.alpine
@@ -11,11 +11,11 @@
# - From the https://hub.docker.com/repository/docker/bitwardenrs/web-vault/tags page, click the tag name and the digest should be there.
# - From the console, with the following commands:
# docker pull bitwardenrs/web-vault:v2.16.0b
-# docker image inspect --format "{{.RepoDigests}}" bitwardenrs/web-vault:v2.16.0b
+# docker image inspect --format "{{.RepoDigests}}" bitwardenrs/web-vault:v2.16.1
#
# - To do the opposite, and get the tag from the hash, you can do:
-# docker image inspect --format "{{.RepoTags}}" bitwardenrs/web-vault@sha256:a6705a4d7776500a6544afd141de1786e6b87c386b068be996294960779cb5bf
-FROM bitwardenrs/web-vault@sha256:a6705a4d7776500a6544afd141de1786e6b87c386b068be996294960779cb5bf as vault
+# docker image inspect --format "{{.RepoTags}}" bitwardenrs/web-vault@sha256:e40228f94cead5e50af6575fb39850a002dad146dab6836e5da5663e6d214303
+FROM bitwardenrs/web-vault@sha256:e40228f94cead5e50af6575fb39850a002dad146dab6836e5da5663e6d214303 as vault
########################## BUILD IMAGE ##########################
FROM messense/rust-musl-cross:armv7-musleabihf as build
@@ -65,7 +65,7 @@ RUN musl-strip target/armv7-unknown-linux-musleabihf/release/bitwarden_rs
######################## RUNTIME IMAGE ########################
# Create a new stage with a minimal image
# because we already have a binary built
-FROM cmosh/alpine-arm
+FROM cmosh/alpine-arm:3.6
ENV ROCKET_ENV "staging"
ENV ROCKET_PORT=80
diff --git a/docker/arm64v8/Dockerfile b/docker/arm64v8/Dockerfile
@@ -10,15 +10,15 @@
# It can be viewed in multiple ways:
# - From the https://hub.docker.com/repository/docker/bitwardenrs/web-vault/tags page, click the tag name and the digest should be there.
# - From the console, with the following commands:
-# docker pull bitwardenrs/web-vault:v2.15.1
-# docker image inspect --format "{{.RepoDigests}}" bitwardenrs/web-vault:v2.15.1
+# docker pull bitwardenrs/web-vault:v2.16.0b
+# docker image inspect --format "{{.RepoDigests}}" bitwardenrs/web-vault:v2.16.1
#
# - To do the opposite, and get the tag from the hash, you can do:
-# docker image inspect --format "{{.RepoTags}}" bitwardenrs/web-vault@sha256:afba1e3bded09dc0a6a0dbacb3363ac33b6f122b4b26d3682cafb9115bdf785c
-FROM bitwardenrs/web-vault@sha256:3581afd49201ea11edc5372ee3ffd8945f005602d9adc0300dcc7ef6860f232c as vault
+# docker image inspect --format "{{.RepoTags}}" bitwardenrs/web-vault@sha256:e40228f94cead5e50af6575fb39850a002dad146dab6836e5da5663e6d214303
+FROM bitwardenrs/web-vault@sha256:e40228f94cead5e50af6575fb39850a002dad146dab6836e5da5663e6d214303 as vault
########################## BUILD IMAGE ##########################
-FROM rust:1.45 as build
+FROM rust:1.46 as build
# ARM only supports SQLite for now
ARG DB=sqlite
@@ -124,3 +124,4 @@ HEALTHCHECK --interval=60s --timeout=10s CMD ["/healthcheck.sh"]
# Configures the startup!
WORKDIR /
CMD ["/start.sh"]
+
