From 188b3b9af10e3b14900f1b4ff82f39620b7b73c7 Mon Sep 17 00:00:00 2001
From: Gitouche <26656-gitouche@users.noreply.framagit.org>
Date: Wed, 5 Apr 2023 22:10:09 +0200
Subject: [PATCH] Hedgedoc : 1.9.7 + passage a buildkit

---
 podman-hedgedoc/ci_build-images.sh | 17 ++++++++++++++---
 podman-hedgedoc/vars.sh            |  2 +-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/podman-hedgedoc/ci_build-images.sh b/podman-hedgedoc/ci_build-images.sh
index c2a1bb6..f1fb9da 100755
--- a/podman-hedgedoc/ci_build-images.sh
+++ b/podman-hedgedoc/ci_build-images.sh
@@ -12,9 +12,20 @@ buildfolder=/tmp/hedgedoc-$$
 if ! podman image exists ${hedgedoc_image}:${hedgedoc_version}; then
     mkdir ${buildfolder} &&
         git clone --depth=1 https://github.com/hedgedoc/container ${buildfolder}/ && {
-	sed_in_place "^FROM node" "FROM docker.io/library/node" ${buildfolder}/alpine/Dockerfile
-	TMPDIR=${HOME} podman image build -t ${hedgedoc_image}:${hedgedoc_version} --build-arg VERSION=${hedgedoc_version/%-alpine/} -f ${buildfolder}/alpine/Dockerfile ${buildfolder}
-    }
+            sed_in_place '^FROM --platform=$BUILDPLATFORM node' 'FROM --platform=$BUILDPLATFORM docker.io/library/node' ${buildfolder}/alpine/Dockerfile
+	    sed_in_place "^FROM node" "FROM docker.io/library/node" ${buildfolder}/alpine/Dockerfile
+            podman pull docker.io/moby/buildkit:latest
+            podman run -d --name buildkitd --privileged docker.io/moby/buildkit:latest &&
+            my_buildctl --addr=podman-container://buildkitd build \
+                        --frontend dockerfile.v0 \
+                        --opt build-arg:VERSION=${hedgedoc_version/%-alpine/} \
+                        --local context=${buildfolder}/ \
+                        --local dockerfile=${buildfolder}/alpine/ \
+                        --output type=oci,name="${hedgedoc_image}:${hedgedoc_version}" | \
+                        podman load &&
+            podman rm --force buildkitd &&
+            podman rmi docker.io/moby/buildkit:latest
+	}
     rm -rf ${buildfolder}
     podman image prune -a -f --filter dangling=true
     podman image prune -a -f --filter intermediate=true
diff --git a/podman-hedgedoc/vars.sh b/podman-hedgedoc/vars.sh
index e63fadd..e8a1ef1 100644
--- a/podman-hedgedoc/vars.sh
+++ b/podman-hedgedoc/vars.sh
@@ -2,7 +2,7 @@
 ## vars
 #hedgedoc_image="quay.io/hedgedoc/hedgedoc"
 hedgedoc_image="git.garbaye.fr/garbaye/hedgedoc"
-hedgedoc_version='1.9.6-alpine'
+hedgedoc_version='1.9.7-alpine'
 database_image="docker.io/library/postgres"
 database_version='14.5-alpine'
 database_path="/var/lib/postgresql/data"