Skip to content

Commit f3ac446

Browse files
committed
Use podman for image builds
* Build platform images with podman build * Push image tags and manifests with podman commands
1 parent 2a4cae5 commit f3ac446

1 file changed

Lines changed: 9 additions & 9 deletions

File tree

Makefile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,23 +31,23 @@ image: \
3131
image-arm64
3232

3333
image-%:
34-
buildah bud -f Dockerfile.$* \
34+
podman build -f Dockerfile.$* \
3535
--security-opt seccomp=unconfined \
3636
-t $(LOCAL_REPO):$(VERSION)-$* \
3737
--layers \
38-
--arch $* --override-arch $* \
38+
--platform linux/$* \
3939
.
4040

4141
push-%:
42-
buildah tag $(LOCAL_REPO):$(VERSION)-$* $(IMAGE_REPO):$(VERSION)-$*
43-
buildah push --format v2s2 $(IMAGE_REPO):$(VERSION)-$*
42+
podman tag $(LOCAL_REPO):$(VERSION)-$* $(IMAGE_REPO):$(VERSION)-$*
43+
podman push $(IMAGE_REPO):$(VERSION)-$*
4444

4545
manifest:
46-
buildah manifest create $(IMAGE_REPO):$(VERSION)
47-
buildah manifest add $(IMAGE_REPO):$(VERSION) docker://$(IMAGE_REPO):$(VERSION)-amd64
48-
buildah manifest add --variant v8 $(IMAGE_REPO):$(VERSION) docker://$(IMAGE_REPO):$(VERSION)-arm64
49-
buildah manifest inspect $(IMAGE_REPO):$(VERSION)
50-
buildah manifest push -f v2s2 $(IMAGE_REPO):$(VERSION) docker://$(IMAGE_REPO):$(VERSION)
46+
podman manifest create $(IMAGE_REPO):$(VERSION)
47+
podman manifest add $(IMAGE_REPO):$(VERSION) docker://$(IMAGE_REPO):$(VERSION)-amd64
48+
podman manifest add $(IMAGE_REPO):$(VERSION) docker://$(IMAGE_REPO):$(VERSION)-arm64
49+
podman manifest inspect $(IMAGE_REPO):$(VERSION)
50+
podman manifest push $(IMAGE_REPO):$(VERSION) docker://$(IMAGE_REPO):$(VERSION)
5151

5252
.PHONY: run
5353
run:

0 commit comments

Comments
 (0)