vw_small

commit c934838aceab6e3803c12c409806a06434344aa5
parent 0d2b3bfb99605ff0bfc65e0e0b71dbfafeb01fce
Author: Daniel García <dani-garcia@users.noreply.github.com>
Date:   Mon,  6 Sep 2021 17:16:28 +0200

Merge branch 'bullseye' of https://github.com/jjlin/vaultwarden into jjlin-bullseye

Diffstat:
M
docker/Dockerfile.j2
 | 
10
+++++-----
M
docker/amd64/Dockerfile
 | 
4
++--
M
docker/arm64/Dockerfile
 | 
4
++--
M
docker/armv6/Dockerfile
 | 
4
++--
M
docker/armv7/Dockerfile
 | 
4
++--

5 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/docker/Dockerfile.j2 b/docker/Dockerfile.j2
@@ -1,7 +1,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.54" %}
+{% set build_stage_base_image = "rust:1.54-bullseye" %}
 {% if "alpine" in target_file %}
 {%   if "amd64" in target_file %}
 {%     set build_stage_base_image = "clux/muslrust:nightly-2021-08-22" %}
@@ -13,19 +13,19 @@
 {%     set package_arch_target = "armv7-unknown-linux-musleabihf" %}
 {%   endif %}
 {% elif "amd64" in target_file %}
-{%   set runtime_stage_base_image = "debian:buster-slim" %}
+{%   set runtime_stage_base_image = "debian:bullseye-slim" %}
 {% elif "arm64" in target_file %}
-{%   set runtime_stage_base_image = "balenalib/aarch64-debian:buster" %}
+{%   set runtime_stage_base_image = "balenalib/aarch64-debian:bullseye" %}
 {%   set package_arch_name = "arm64" %}
 {%   set package_arch_target = "aarch64-unknown-linux-gnu" %}
 {%   set package_cross_compiler = "aarch64-linux-gnu" %}
 {% elif "armv6" in target_file %}
-{%   set runtime_stage_base_image = "balenalib/rpi-debian:buster" %}
+{%   set runtime_stage_base_image = "balenalib/rpi-debian:bullseye" %}
 {%   set package_arch_name = "armel" %}
 {%   set package_arch_target = "arm-unknown-linux-gnueabi" %}
 {%   set package_cross_compiler = "arm-linux-gnueabi" %}
 {% elif "armv7" in target_file %}
-{%   set runtime_stage_base_image = "balenalib/armv7hf-debian:buster" %}
+{%   set runtime_stage_base_image = "balenalib/armv7hf-debian:bullseye" %}
 {%   set package_arch_name = "armhf" %}
 {%   set package_arch_target = "armv7-unknown-linux-gnueabihf" %}
 {%   set package_cross_compiler = "arm-linux-gnueabihf" %}
diff --git a/docker/amd64/Dockerfile b/docker/amd64/Dockerfile
@@ -25,7 +25,7 @@
 FROM vaultwarden/web-vault@sha256:29a4fa7bf3790fff9d908b02ac5a154913491f4bf30c95b87b06d8cf1c5516b5 as vault
 
 ########################## BUILD IMAGE  ##########################
-FROM rust:1.54 as build
+FROM rust:1.54-bullseye as build
 
 # Debian-based builds support multidb
 ARG DB=sqlite,mysql,postgresql
@@ -73,7 +73,7 @@ RUN cargo build --features ${DB} --release
 ######################## RUNTIME IMAGE  ########################
 # Create a new stage with a minimal image
 # because we already have a binary built
-FROM debian:buster-slim
+FROM debian:bullseye-slim
 
 ENV ROCKET_ENV "staging"
 ENV ROCKET_PORT=80
diff --git a/docker/arm64/Dockerfile b/docker/arm64/Dockerfile
@@ -25,7 +25,7 @@
 FROM vaultwarden/web-vault@sha256:29a4fa7bf3790fff9d908b02ac5a154913491f4bf30c95b87b06d8cf1c5516b5 as vault
 
 ########################## BUILD IMAGE  ##########################
-FROM rust:1.54 as build
+FROM rust:1.54-bullseye as build
 
 # Debian-based builds support multidb
 ARG DB=sqlite,mysql,postgresql
@@ -109,7 +109,7 @@ RUN cargo build --features ${DB} --release --target=aarch64-unknown-linux-gnu
 ######################## RUNTIME IMAGE  ########################
 # Create a new stage with a minimal image
 # because we already have a binary built
-FROM balenalib/aarch64-debian:buster
+FROM balenalib/aarch64-debian:bullseye
 
 ENV ROCKET_ENV "staging"
 ENV ROCKET_PORT=80
diff --git a/docker/armv6/Dockerfile b/docker/armv6/Dockerfile
@@ -25,7 +25,7 @@
 FROM vaultwarden/web-vault@sha256:29a4fa7bf3790fff9d908b02ac5a154913491f4bf30c95b87b06d8cf1c5516b5 as vault
 
 ########################## BUILD IMAGE  ##########################
-FROM rust:1.54 as build
+FROM rust:1.54-bullseye as build
 
 # Debian-based builds support multidb
 ARG DB=sqlite,mysql,postgresql
@@ -109,7 +109,7 @@ RUN cargo build --features ${DB} --release --target=arm-unknown-linux-gnueabi
 ######################## RUNTIME IMAGE  ########################
 # Create a new stage with a minimal image
 # because we already have a binary built
-FROM balenalib/rpi-debian:buster
+FROM balenalib/rpi-debian:bullseye
 
 ENV ROCKET_ENV "staging"
 ENV ROCKET_PORT=80
diff --git a/docker/armv7/Dockerfile b/docker/armv7/Dockerfile
@@ -25,7 +25,7 @@
 FROM vaultwarden/web-vault@sha256:29a4fa7bf3790fff9d908b02ac5a154913491f4bf30c95b87b06d8cf1c5516b5 as vault
 
 ########################## BUILD IMAGE  ##########################
-FROM rust:1.54 as build
+FROM rust:1.54-bullseye as build
 
 # Debian-based builds support multidb
 ARG DB=sqlite,mysql,postgresql
@@ -109,7 +109,7 @@ RUN cargo build --features ${DB} --release --target=armv7-unknown-linux-gnueabih
 ######################## RUNTIME IMAGE  ########################
 # Create a new stage with a minimal image
 # because we already have a binary built
-FROM balenalib/armv7hf-debian:buster
+FROM balenalib/armv7hf-debian:bullseye
 
 ENV ROCKET_ENV "staging"
 ENV ROCKET_PORT=80