From 996ac0e939689bd5016f319bc32545b4894f2909 Mon Sep 17 00:00:00 2001 From: Gitouche <26656-gitouche@users.noreply.framagit.org> Date: Sat, 20 May 2023 16:19:11 +0200 Subject: [PATCH] Hedgedoc : construire image sans buildkit #15 --- podman-hedgedoc/ci_build-images.sh | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/podman-hedgedoc/ci_build-images.sh b/podman-hedgedoc/ci_build-images.sh index a769a47..bb36310 100755 --- a/podman-hedgedoc/ci_build-images.sh +++ b/podman-hedgedoc/ci_build-images.sh @@ -14,17 +14,7 @@ if ! podman image exists ${hedgedoc_image}:${hedgedoc_version}; then git clone --depth=1 https://github.com/hedgedoc/container ${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 image pull docker.io/moby/buildkit:latest - podman container 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 image load && - podman container rm --force buildkitd && - podman image rm docker.io/moby/buildkit:latest + podman image build -t ${hedgedoc_image}:${hedgedoc_version} -f ${buildfolder}/alpine/Dockerfile ${buildfolder}/ } rm -rf ${buildfolder} podman image prune -a -f --filter dangling=true