From 8b20c4e45cda4c92374e976cee839612ac82843b Mon Sep 17 00:00:00 2001
From: Gitouche <26656-gitouche@users.noreply.framagit.org>
Date: Fri, 16 Feb 2024 21:10:07 +0100
Subject: [PATCH] vaultwarden : 1.30.3 fix?

---
 podman-vaultwarden/ci_build-images.sh | 8 ++------
 podman-vaultwarden/vars.sh            | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/podman-vaultwarden/ci_build-images.sh b/podman-vaultwarden/ci_build-images.sh
index 38c9c24..c6520ab 100755
--- a/podman-vaultwarden/ci_build-images.sh
+++ b/podman-vaultwarden/ci_build-images.sh
@@ -11,12 +11,8 @@ buildfolder=/tmp/vaultwarden-$$
 
 if ! podman image exists ${service_image}:${service_version}; then
     mkdir ${buildfolder} &&
-    if git clone --depth=1 --branch=${service_version} https://github.com/dani-garcia/vaultwarden.git ${buildfolder}/ ; then 
-	TMPDIR=${HOME} podman image build \
-	      -t ${service_image}:${service_version} \
-	      --build-arg DB=postgresql,enable_mimalloc \
-	      -f ${buildfolder}/docker/Dockerfile.debian \
-	      ${buildfolder} || retval=false
+    if git clone --depth=1 --branch=${service_version%%-*} https://github.com/dani-garcia/vaultwarden.git ${buildfolder}/ ; then
+	TMPDIR=${HOME} DB='postgresql,enable_mimalloc' CONTAINER_REGISTRIES='git.garbaye.fr/garbaye/vaultwarden' BASE_TAGS=${service_version%%-*} ${buildfolder}/docker/podman-bake.sh || retval=false
 	podman image prune -a -f --filter dangling=true
 	podman image prune -a -f --filter intermediate=true
 	podman image rm -f $(podman image list -a -q -- vaultwarden/web-vault)
diff --git a/podman-vaultwarden/vars.sh b/podman-vaultwarden/vars.sh
index 45cfbdf..25a1ddd 100644
--- a/podman-vaultwarden/vars.sh
+++ b/podman-vaultwarden/vars.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 ## vars
 service_image="git.garbaye.fr/garbaye/vaultwarden"
-service_version='1.30.3'
+service_version='1.30.3-amd64'
 database_image="docker.io/library/postgres"
 database_version='14-alpine'
 database_path="/var/lib/postgresql/data"