From 0acc049aa70a9921c45cf0f9d4bfc71b8b3cc56c Mon Sep 17 00:00:00 2001
From: Gitouche <guigui.benmaurice@gmail.com>
Date: Sat, 21 Dec 2024 20:47:39 +0100
Subject: [PATCH] privatebin: maj pour evolution

---
 podman-privatebin/ci_build-images.sh | 5 +++--
 podman-privatebin/vars.sh            | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/podman-privatebin/ci_build-images.sh b/podman-privatebin/ci_build-images.sh
index 65a17e7..175ac37 100755
--- a/podman-privatebin/ci_build-images.sh
+++ b/podman-privatebin/ci_build-images.sh
@@ -13,8 +13,9 @@ if ! podman image exists ${privatebin_image}:${privatebin_version}; then
     if git clone -b ${privatebin_version} --depth=1 https://github.com/PrivateBin/docker-nginx-fpm-alpine ${buildfolder} ; then
 	sed -i "s#mv cfg lib tpl vendor /srv#mv cfg lib tpl vendor /srv \&\& sed -i \\'/Content-Security-Policy\\\|X-XSS-Protection\\\|X-Frame-Options\\\|X-Content-Type-Options/d\\' /srv/lib/Controller.php#" ${buildfolder}/Dockerfile &&
         TMPDIR=${HOME} podman image build \
-	       -t "${privatebin_image}":"${privatebin_version}" \
-	       ${buildfolder} || retval=false
+		--label "org.opencontainers.image.revision=$(cd ${buildfolder} ; git rev-parse HEAD)" \
+		-t "${privatebin_image}":"${privatebin_version}" \
+		${buildfolder} || 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 -- docker.io/library/alpine)
diff --git a/podman-privatebin/vars.sh b/podman-privatebin/vars.sh
index 12da000..1de87aa 100755
--- a/podman-privatebin/vars.sh
+++ b/podman-privatebin/vars.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 ## vars
 privatebin_image="git.garbaye.fr/garbaye/privatebin-nginx-fpm-alpine"
-privatebin_version='1.7.5-alpine3.20.3'
+privatebin_version='1.7.5-alpine3.21'
 ## default vars : override with ENV var
 listen_if="${GARBAYE_PRIVATEBIN_ENV_LISTENIF:-127.0.0.1}"
 listen_port="${GARBAYE_PRIVATEBIN_ENV_LISTENPORT:-8084}"