Browse Source
Merge branch 'dscottboggs-fix/CVE-2022-21658' into main
pull/2257/head
Daniel García
3 years ago
No known key found for this signature in database
GPG Key ID: FC8A7D14C3CD543A
11 changed files with
11 additions and
11 deletions
-
Cargo.toml
-
docker/Dockerfile.j2
-
docker/amd64/Dockerfile
-
docker/amd64/Dockerfile.buildx
-
docker/arm64/Dockerfile
-
docker/arm64/Dockerfile.buildx
-
docker/armv6/Dockerfile
-
docker/armv6/Dockerfile.buildx
-
docker/armv7/Dockerfile
-
docker/armv7/Dockerfile.buildx
-
rust-toolchain
|
|
|
@ -3,7 +3,7 @@ name = "vaultwarden" |
|
|
|
version = "1.0.0" |
|
|
|
authors = ["Daniel García <dani-garcia@users.noreply.github.com>"] |
|
|
|
edition = "2021" |
|
|
|
rust-version = "1.57" |
|
|
|
rust-version = "1.60" |
|
|
|
resolver = "2" |
|
|
|
|
|
|
|
repository = "https://github.com/dani-garcia/vaultwarden" |
|
|
|
|
|
|
|
@ -3,7 +3,7 @@ |
|
|
|
# This file was generated using a Jinja2 template. |
|
|
|
# Please make your changes in `Dockerfile.j2` and then `make` the individual Dockerfiles. |
|
|
|
|
|
|
|
{% set build_stage_base_image = "rust:1.57-buster" %} |
|
|
|
{% set build_stage_base_image = "rust:1.60-buster" %} |
|
|
|
{% if "alpine" in target_file %} |
|
|
|
{% if "amd64" in target_file %} |
|
|
|
{% set build_stage_base_image = "blackdex/rust-musl:x86_64-musl-nightly-2021-12-25" %} |
|
|
|
|
|
|
|
@ -27,7 +27,7 @@ |
|
|
|
FROM vaultwarden/web-vault@sha256:0df389deac9e83c739a1f4ff595f12f493b6c27cb4a22bb8fcaba9dc49b9b527 as vault |
|
|
|
|
|
|
|
########################## BUILD IMAGE ########################## |
|
|
|
FROM rust:1.57-buster as build |
|
|
|
FROM rust:1.58-buster as build |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -27,7 +27,7 @@ |
|
|
|
FROM vaultwarden/web-vault@sha256:0df389deac9e83c739a1f4ff595f12f493b6c27cb4a22bb8fcaba9dc49b9b527 as vault |
|
|
|
|
|
|
|
########################## BUILD IMAGE ########################## |
|
|
|
FROM rust:1.57-buster as build |
|
|
|
FROM rust:1.58-buster as build |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -27,7 +27,7 @@ |
|
|
|
FROM vaultwarden/web-vault@sha256:0df389deac9e83c739a1f4ff595f12f493b6c27cb4a22bb8fcaba9dc49b9b527 as vault |
|
|
|
|
|
|
|
########################## BUILD IMAGE ########################## |
|
|
|
FROM rust:1.57-buster as build |
|
|
|
FROM rust:1.58-buster as build |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -27,7 +27,7 @@ |
|
|
|
FROM vaultwarden/web-vault@sha256:0df389deac9e83c739a1f4ff595f12f493b6c27cb4a22bb8fcaba9dc49b9b527 as vault |
|
|
|
|
|
|
|
########################## BUILD IMAGE ########################## |
|
|
|
FROM rust:1.57-buster as build |
|
|
|
FROM rust:1.58-buster as build |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -27,7 +27,7 @@ |
|
|
|
FROM vaultwarden/web-vault@sha256:0df389deac9e83c739a1f4ff595f12f493b6c27cb4a22bb8fcaba9dc49b9b527 as vault |
|
|
|
|
|
|
|
########################## BUILD IMAGE ########################## |
|
|
|
FROM rust:1.57-buster as build |
|
|
|
FROM rust:1.58-buster as build |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -27,7 +27,7 @@ |
|
|
|
FROM vaultwarden/web-vault@sha256:0df389deac9e83c739a1f4ff595f12f493b6c27cb4a22bb8fcaba9dc49b9b527 as vault |
|
|
|
|
|
|
|
########################## BUILD IMAGE ########################## |
|
|
|
FROM rust:1.57-buster as build |
|
|
|
FROM rust:1.58-buster as build |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -27,7 +27,7 @@ |
|
|
|
FROM vaultwarden/web-vault@sha256:0df389deac9e83c739a1f4ff595f12f493b6c27cb4a22bb8fcaba9dc49b9b527 as vault |
|
|
|
|
|
|
|
########################## BUILD IMAGE ########################## |
|
|
|
FROM rust:1.57-buster as build |
|
|
|
FROM rust:1.58-buster as build |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -27,7 +27,7 @@ |
|
|
|
FROM vaultwarden/web-vault@sha256:0df389deac9e83c739a1f4ff595f12f493b6c27cb4a22bb8fcaba9dc49b9b527 as vault |
|
|
|
|
|
|
|
########################## BUILD IMAGE ########################## |
|
|
|
FROM rust:1.57-buster as build |
|
|
|
FROM rust:1.58-buster as build |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -1 +1 @@ |
|
|
|
nightly-2021-12-25 |
|
|
|
nightly-2022-01-23 |
|
|
|
|
