aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorBlackDex <[email protected]>2022-11-04 12:56:02 +0100
committerBlackDex <[email protected]>2022-11-08 14:03:31 +0100
commitb010dde6613fbdcf4c273dfe9b83402e0e10cc51 (patch)
tree7146dc082206f8356e9d3d1ec0ddc84a6ff5f582 /docker
parentf60a6929a9a289bd39c38eeb793ebf54c4d88199 (diff)
downloadvaultwarden-b010dde6613fbdcf4c273dfe9b83402e0e10cc51.tar.gz
vaultwarden-b010dde6613fbdcf4c273dfe9b83402e0e10cc51.zip
Update Rust version, deps and workflow
- Update Rust to v1.65.0 - Update dependencies - Updated workflow files - Added some extra clippy checks - Fixed some clippy checks
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile.j210
-rw-r--r--docker/amd64/Dockerfile2
-rw-r--r--docker/amd64/Dockerfile.alpine2
-rw-r--r--docker/amd64/Dockerfile.buildx2
-rw-r--r--docker/amd64/Dockerfile.buildx.alpine2
-rw-r--r--docker/arm64/Dockerfile2
-rw-r--r--docker/arm64/Dockerfile.alpine2
-rw-r--r--docker/arm64/Dockerfile.buildx2
-rw-r--r--docker/arm64/Dockerfile.buildx.alpine2
-rw-r--r--docker/armv6/Dockerfile2
-rw-r--r--docker/armv6/Dockerfile.alpine2
-rw-r--r--docker/armv6/Dockerfile.buildx2
-rw-r--r--docker/armv6/Dockerfile.buildx.alpine2
-rw-r--r--docker/armv7/Dockerfile2
-rw-r--r--docker/armv7/Dockerfile.alpine2
-rw-r--r--docker/armv7/Dockerfile.buildx2
-rw-r--r--docker/armv7/Dockerfile.buildx.alpine2
17 files changed, 21 insertions, 21 deletions
diff --git a/docker/Dockerfile.j2 b/docker/Dockerfile.j2
index aa5abf3e..cbff3293 100644
--- a/docker/Dockerfile.j2
+++ b/docker/Dockerfile.j2
@@ -3,22 +3,22 @@
# 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.64-bullseye" %}
+{% set build_stage_base_image = "rust:1.65-bullseye" %}
{% if "alpine" in target_file %}
{% if "amd64" in target_file %}
-{% set build_stage_base_image = "blackdex/rust-musl:x86_64-musl-stable-1.64.0" %}
+{% set build_stage_base_image = "blackdex/rust-musl:x86_64-musl-stable-1.65.0" %}
{% set runtime_stage_base_image = "alpine:3.16" %}
{% set package_arch_target = "x86_64-unknown-linux-musl" %}
{% elif "armv7" in target_file %}
-{% set build_stage_base_image = "blackdex/rust-musl:armv7-musleabihf-stable-1.64.0" %}
+{% set build_stage_base_image = "blackdex/rust-musl:armv7-musleabihf-stable-1.65.0" %}
{% set runtime_stage_base_image = "balenalib/armv7hf-alpine:3.16" %}
{% set package_arch_target = "armv7-unknown-linux-musleabihf" %}
{% elif "armv6" in target_file %}
-{% set build_stage_base_image = "blackdex/rust-musl:arm-musleabi-stable-1.64.0" %}
+{% set build_stage_base_image = "blackdex/rust-musl:arm-musleabi-stable-1.65.0" %}
{% set runtime_stage_base_image = "balenalib/rpi-alpine:3.16" %}
{% set package_arch_target = "arm-unknown-linux-musleabi" %}
{% elif "arm64" in target_file %}
-{% set build_stage_base_image = "blackdex/rust-musl:aarch64-musl-stable-1.64.0" %}
+{% set build_stage_base_image = "blackdex/rust-musl:aarch64-musl-stable-1.65.0" %}
{% set runtime_stage_base_image = "balenalib/aarch64-alpine:3.16" %}
{% set package_arch_target = "aarch64-unknown-linux-musl" %}
{% endif %}
diff --git a/docker/amd64/Dockerfile b/docker/amd64/Dockerfile
index 983de7a5..050cfef3 100644
--- a/docker/amd64/Dockerfile
+++ b/docker/amd64/Dockerfile
@@ -27,7 +27,7 @@
FROM vaultwarden/web-vault@sha256:85f5e0eaea73dfa14cfbdc64676ebbdd7aba5483ee5c1735e5eb82bd55b105f8 as vault
########################## BUILD IMAGE ##########################
-FROM rust:1.64-bullseye as build
+FROM rust:1.65-bullseye as build
diff --git a/docker/amd64/Dockerfile.alpine b/docker/amd64/Dockerfile.alpine
index 123ef996..bfbe0583 100644
--- a/docker/amd64/Dockerfile.alpine
+++ b/docker/amd64/Dockerfile.alpine
@@ -27,7 +27,7 @@
FROM vaultwarden/web-vault@sha256:85f5e0eaea73dfa14cfbdc64676ebbdd7aba5483ee5c1735e5eb82bd55b105f8 as vault
########################## BUILD IMAGE ##########################
-FROM blackdex/rust-musl:x86_64-musl-stable-1.64.0 as build
+FROM blackdex/rust-musl:x86_64-musl-stable-1.65.0 as build
diff --git a/docker/amd64/Dockerfile.buildx b/docker/amd64/Dockerfile.buildx
index a01e4eb3..18b80d4c 100644
--- a/docker/amd64/Dockerfile.buildx
+++ b/docker/amd64/Dockerfile.buildx
@@ -27,7 +27,7 @@
FROM vaultwarden/web-vault@sha256:85f5e0eaea73dfa14cfbdc64676ebbdd7aba5483ee5c1735e5eb82bd55b105f8 as vault
########################## BUILD IMAGE ##########################
-FROM rust:1.64-bullseye as build
+FROM rust:1.65-bullseye as build
diff --git a/docker/amd64/Dockerfile.buildx.alpine b/docker/amd64/Dockerfile.buildx.alpine
index 29ba280f..a5aab60b 100644
--- a/docker/amd64/Dockerfile.buildx.alpine
+++ b/docker/amd64/Dockerfile.buildx.alpine
@@ -27,7 +27,7 @@
FROM vaultwarden/web-vault@sha256:85f5e0eaea73dfa14cfbdc64676ebbdd7aba5483ee5c1735e5eb82bd55b105f8 as vault
########################## BUILD IMAGE ##########################
-FROM blackdex/rust-musl:x86_64-musl-stable-1.64.0 as build
+FROM blackdex/rust-musl:x86_64-musl-stable-1.65.0 as build
diff --git a/docker/arm64/Dockerfile b/docker/arm64/Dockerfile
index dda5c7ac..a46daab7 100644
--- a/docker/arm64/Dockerfile
+++ b/docker/arm64/Dockerfile
@@ -27,7 +27,7 @@
FROM vaultwarden/web-vault@sha256:85f5e0eaea73dfa14cfbdc64676ebbdd7aba5483ee5c1735e5eb82bd55b105f8 as vault
########################## BUILD IMAGE ##########################
-FROM rust:1.64-bullseye as build
+FROM rust:1.65-bullseye as build
diff --git a/docker/arm64/Dockerfile.alpine b/docker/arm64/Dockerfile.alpine
index f8365264..47eb711b 100644
--- a/docker/arm64/Dockerfile.alpine
+++ b/docker/arm64/Dockerfile.alpine
@@ -27,7 +27,7 @@
FROM vaultwarden/web-vault@sha256:85f5e0eaea73dfa14cfbdc64676ebbdd7aba5483ee5c1735e5eb82bd55b105f8 as vault
########################## BUILD IMAGE ##########################
-FROM blackdex/rust-musl:aarch64-musl-stable-1.64.0 as build
+FROM blackdex/rust-musl:aarch64-musl-stable-1.65.0 as build
diff --git a/docker/arm64/Dockerfile.buildx b/docker/arm64/Dockerfile.buildx
index 95288b44..736b7b5f 100644
--- a/docker/arm64/Dockerfile.buildx
+++ b/docker/arm64/Dockerfile.buildx
@@ -27,7 +27,7 @@
FROM vaultwarden/web-vault@sha256:85f5e0eaea73dfa14cfbdc64676ebbdd7aba5483ee5c1735e5eb82bd55b105f8 as vault
########################## BUILD IMAGE ##########################
-FROM rust:1.64-bullseye as build
+FROM rust:1.65-bullseye as build
diff --git a/docker/arm64/Dockerfile.buildx.alpine b/docker/arm64/Dockerfile.buildx.alpine
index d8974e6d..73527078 100644
--- a/docker/arm64/Dockerfile.buildx.alpine
+++ b/docker/arm64/Dockerfile.buildx.alpine
@@ -27,7 +27,7 @@
FROM vaultwarden/web-vault@sha256:85f5e0eaea73dfa14cfbdc64676ebbdd7aba5483ee5c1735e5eb82bd55b105f8 as vault
########################## BUILD IMAGE ##########################
-FROM blackdex/rust-musl:aarch64-musl-stable-1.64.0 as build
+FROM blackdex/rust-musl:aarch64-musl-stable-1.65.0 as build
diff --git a/docker/armv6/Dockerfile b/docker/armv6/Dockerfile
index 28584a5e..96085c9a 100644
--- a/docker/armv6/Dockerfile
+++ b/docker/armv6/Dockerfile
@@ -27,7 +27,7 @@
FROM vaultwarden/web-vault@sha256:85f5e0eaea73dfa14cfbdc64676ebbdd7aba5483ee5c1735e5eb82bd55b105f8 as vault
########################## BUILD IMAGE ##########################
-FROM rust:1.64-bullseye as build
+FROM rust:1.65-bullseye as build
diff --git a/docker/armv6/Dockerfile.alpine b/docker/armv6/Dockerfile.alpine
index 9d42dfc9..1d4884e5 100644
--- a/docker/armv6/Dockerfile.alpine
+++ b/docker/armv6/Dockerfile.alpine
@@ -27,7 +27,7 @@
FROM vaultwarden/web-vault@sha256:85f5e0eaea73dfa14cfbdc64676ebbdd7aba5483ee5c1735e5eb82bd55b105f8 as vault
########################## BUILD IMAGE ##########################
-FROM blackdex/rust-musl:arm-musleabi-stable-1.64.0 as build
+FROM blackdex/rust-musl:arm-musleabi-stable-1.65.0 as build
diff --git a/docker/armv6/Dockerfile.buildx b/docker/armv6/Dockerfile.buildx
index fdda93e6..6f03e64e 100644
--- a/docker/armv6/Dockerfile.buildx
+++ b/docker/armv6/Dockerfile.buildx
@@ -27,7 +27,7 @@
FROM vaultwarden/web-vault@sha256:85f5e0eaea73dfa14cfbdc64676ebbdd7aba5483ee5c1735e5eb82bd55b105f8 as vault
########################## BUILD IMAGE ##########################
-FROM rust:1.64-bullseye as build
+FROM rust:1.65-bullseye as build
diff --git a/docker/armv6/Dockerfile.buildx.alpine b/docker/armv6/Dockerfile.buildx.alpine
index 91a561be..b7e4246d 100644
--- a/docker/armv6/Dockerfile.buildx.alpine
+++ b/docker/armv6/Dockerfile.buildx.alpine
@@ -27,7 +27,7 @@
FROM vaultwarden/web-vault@sha256:85f5e0eaea73dfa14cfbdc64676ebbdd7aba5483ee5c1735e5eb82bd55b105f8 as vault
########################## BUILD IMAGE ##########################
-FROM blackdex/rust-musl:arm-musleabi-stable-1.64.0 as build
+FROM blackdex/rust-musl:arm-musleabi-stable-1.65.0 as build
diff --git a/docker/armv7/Dockerfile b/docker/armv7/Dockerfile
index 8601b2af..517e66c0 100644
--- a/docker/armv7/Dockerfile
+++ b/docker/armv7/Dockerfile
@@ -27,7 +27,7 @@
FROM vaultwarden/web-vault@sha256:85f5e0eaea73dfa14cfbdc64676ebbdd7aba5483ee5c1735e5eb82bd55b105f8 as vault
########################## BUILD IMAGE ##########################
-FROM rust:1.64-bullseye as build
+FROM rust:1.65-bullseye as build
diff --git a/docker/armv7/Dockerfile.alpine b/docker/armv7/Dockerfile.alpine
index eb155b13..526d3ec5 100644
--- a/docker/armv7/Dockerfile.alpine
+++ b/docker/armv7/Dockerfile.alpine
@@ -27,7 +27,7 @@
FROM vaultwarden/web-vault@sha256:85f5e0eaea73dfa14cfbdc64676ebbdd7aba5483ee5c1735e5eb82bd55b105f8 as vault
########################## BUILD IMAGE ##########################
-FROM blackdex/rust-musl:armv7-musleabihf-stable-1.64.0 as build
+FROM blackdex/rust-musl:armv7-musleabihf-stable-1.65.0 as build
diff --git a/docker/armv7/Dockerfile.buildx b/docker/armv7/Dockerfile.buildx
index 946e94ed..40877ead 100644
--- a/docker/armv7/Dockerfile.buildx
+++ b/docker/armv7/Dockerfile.buildx
@@ -27,7 +27,7 @@
FROM vaultwarden/web-vault@sha256:85f5e0eaea73dfa14cfbdc64676ebbdd7aba5483ee5c1735e5eb82bd55b105f8 as vault
########################## BUILD IMAGE ##########################
-FROM rust:1.64-bullseye as build
+FROM rust:1.65-bullseye as build
diff --git a/docker/armv7/Dockerfile.buildx.alpine b/docker/armv7/Dockerfile.buildx.alpine
index e8f0ad91..4f45b601 100644
--- a/docker/armv7/Dockerfile.buildx.alpine
+++ b/docker/armv7/Dockerfile.buildx.alpine
@@ -27,7 +27,7 @@
FROM vaultwarden/web-vault@sha256:85f5e0eaea73dfa14cfbdc64676ebbdd7aba5483ee5c1735e5eb82bd55b105f8 as vault
########################## BUILD IMAGE ##########################
-FROM blackdex/rust-musl:armv7-musleabihf-stable-1.64.0 as build
+FROM blackdex/rust-musl:armv7-musleabihf-stable-1.65.0 as build