From a0d11e2a6758a7b20c48446fea4dab3a6cae8aaf Mon Sep 17 00:00:00 2001 From: Gitouche <26656-gitouche@users.noreply.framagit.org> Date: Sat, 5 Mar 2022 12:53:20 +0100 Subject: [PATCH] Matrix image build : switch buildkit output to OCI format --- podman-matrix/zz_build-images.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/podman-matrix/zz_build-images.sh b/podman-matrix/zz_build-images.sh index 0e2e8a2..fb037c7 100755 --- a/podman-matrix/zz_build-images.sh +++ b/podman-matrix/zz_build-images.sh @@ -19,11 +19,10 @@ if ! podman image exists localhost/matrixdotorg/synapse:${synapse_version}; then --frontend dockerfile.v0 \ --local context=${buildfolder}/ \ --local dockerfile=${buildfolder}/docker/ \ - --output type=tar | \ - podman import --change 'EXPOSE 8008/tcp' \ - --change 'EXPOSE 8009/tcp' \ - --change 'EXPOSE 8448/tcp' \ - --change 'ENTRYPOINT ["/start.py"]' - localhost/matrixdotorg/synapse:${synapse_version} && + --output type=oci,name="fixme:synapse_${synapse_version}" | \ + podman load && + podman image tag localhost/synapse_${synapse_version}:latest ${synapse_image}:${synapse_version} + podman image rm localhost/synapse_${synapse_version}:latest podman rm --force buildkitd && podman rmi docker.io/moby/buildkit:latest && rm -f ~/bin/buildctl