From f0b02528890580d7bb6befcdc01d802758698cf7 Mon Sep 17 00:00:00 2001
From: GoliathLabs <git@xdfr.de>
Date: Sat, 11 Dec 2021 14:10:12 +0100
Subject: [PATCH] Updated Dockerfiles

---
 Dockerfile        | 11 ++++++++---
 Dockerfile.alpine |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 450d63b..44d693b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,16 @@
-FROM rust:1.56.1 as builder
+ARG BUILD_TAG=1.57.0
+ARG RUN_TAG=slim-buster
+FROM rust:${BUILD_TAG}-${RUN_TAG} as builder
 
 WORKDIR /usr/src/
 RUN USER=root cargo new --bin vaultwarden_ldap
 WORKDIR /usr/src/vaultwarden_ldap
 
+# Copy manifests
+COPY ./Cargo.lock ./Cargo.lock
+COPY ./Cargo.toml ./Cargo.toml
+
 # Compile dependencies
-COPY Cargo.toml Cargo.lock ./
 RUN cargo build --locked --release
 
 # Remove bins to make sure we rebuild
@@ -15,7 +20,7 @@ RUN rm ./target/release/deps/vaultwarden_ldap*
 COPY src ./src
 RUN cargo build --release
 
-FROM rust:$RUN_TAG
+FROM rust:${BUILD_TAG}-${RUN_TAG}
 WORKDIR /app
 COPY --from=builder /usr/src/vaultwarden_ldap/target/release/vaultwarden_ldap /usr/local/bin/
 
diff --git a/Dockerfile.alpine b/Dockerfile.alpine
index f6ead7d..5dedab6 100644
--- a/Dockerfile.alpine
+++ b/Dockerfile.alpine
@@ -13,7 +13,7 @@ RUN USER=rust touch ./src/main.rs
 # hadolint ignore=DL3059
 RUN cargo build --release
 
-FROM alpine:3
+FROM alpine:3.15.0
 RUN apk --no-cache add ca-certificates=20191127-r7
 COPY --from=builder \
     /home/rust/src/target/x86_64-unknown-linux-musl/release/vaultwarden_ldap \