From f98a84b6ed2acf6fd1923f31db5192d3d083c117 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <dbd@ehtrace.com>
Date: Mon, 13 Nov 2023 23:26:00 +0100
Subject: [PATCH] Update to 1.30.0 (but use upstream image for now)

---
 images/vaultwarden/Dockerfile | 8 ++++++--
 variables.yml                 | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/images/vaultwarden/Dockerfile b/images/vaultwarden/Dockerfile
index 114f307..286f451 100644
--- a/images/vaultwarden/Dockerfile
+++ b/images/vaultwarden/Dockerfile
@@ -1,8 +1,8 @@
 FROM rust:alpine AS build
 
 ARG VAULTWARDEN_FEATURES=[[ join .vaultwarden.server.features "," ]] \
-    VAULTWARDEN_SERVER_VERSION=1.29.2 \
-    VAULTWARDEN_WEB_VERSION=2023.9.1
+    VAULTWARDEN_SERVER_VERSION=1.30.0 \
+    VAULTWARDEN_WEB_VERSION=2023.10.0
 
 RUN set -euxo pipefail &&\
     apk --no-cache upgrade &&\
@@ -11,8 +11,11 @@ RUN set -euxo pipefail &&\
       ca-certificates \
       tar \
       musl-dev \
+      openssl-libs-static \
+      build-base \
 [[- if has .vaultwarden.server.features "postgresql" ]]
       postgresql15-dev \
+      libpq-dev \
 [[- end ]]
 [[- if has .vaultwarden.server.features "mysql" ]]
       mariadb-dev \
@@ -25,6 +28,7 @@ RUN set -euxo pipefail &&\
     curl -sSLO https://github.com/dani-garcia/vaultwarden/archive/refs/tags/${VAULTWARDEN_SERVER_VERSION}.tar.gz &&\
     tar xvzf ${VAULTWARDEN_SERVER_VERSION}.tar.gz &&\
     cd vaultwarden-${VAULTWARDEN_SERVER_VERSION} &&\
+    rustup set profile minimal &&\
     rustup target add x86_64-unknown-linux-musl &&\
     cargo build --features=${VAULTWARDEN_FEATURES} --profile "release" --target "x86_64-unknown-linux-musl" &&\
     find ./target -type f -name vaultwarden &&\
diff --git a/variables.yml b/variables.yml
index 4b3487e..43eb695 100644
--- a/variables.yml
+++ b/variables.yml
@@ -4,8 +4,8 @@ vaultwarden:
   instance: vaultwarden
   server:
     count: 1
-    image: vaultwarden/server:1.29.2
-    #image: danielberteaud/vaultwarden:latest
+    image: vaultwarden/server:1.30.0-alpine
+    #image: danielberteaud/vaultwarden:1.30.0-1
     features:
       - postgresql
     resources: